Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable-3.9] do not check every 5 seconds files with infinite timeout (= 0) #6061

Merged
merged 1 commit into from
Sep 14, 2023
Merged

[stable-3.9] do not check every 5 seconds files with infinite timeout (= 0) #6061

merged 1 commit into from
Sep 14, 2023

Conversation

backportbot-nextcloud[bot]
Copy link

Backport of #6059

@mgallien mgallien enabled auto-merge September 14, 2023 21:03
@mgallien
do not check every 5 seconds files with infinite timeout (= 0)
da58696 
we want to schedule a new sync attempt if a file is likely to have been
unlocked due to timeout expiring on server

but if the timeout is null (equal to 0), there will be no timeout on
server and no automated unlocking, so do not schedule a sync every 5
seconds to check for it

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the backport/6059/stable-3.9 branch from 9bbf12a to da58696 Compare September 14, 2023 21:18
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6061-da586963a134df4dbac1db2df0871f93c23f7537-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@codecov
Copy link

codecov bot commented Sep 14, 2023

Codecov Report

Merging #6061 (9bbf12a) into stable-3.9 (4977249) will decrease coverage by 0.22%.
Report is 1 commits behind head on stable-3.9.
The diff coverage is 100.00%.

❗ Current head 9bbf12a differs from pull request most recent head da58696. Consider uploading reports for the commit da58696 to get more accurate results

Additional details and impacted files 
@@              Coverage Diff               @@
##           stable-3.9    #6061      +/-   ##
==============================================
- Coverage       60.69%   60.47%   -0.22%     
==============================================
  Files             145      145              
  Lines           18673    18682       +9     
==============================================
- Hits            11333    11298      -35     
- Misses           7340     7384      +44
Files Changed Coverage Δ
src/libsync/discovery.cpp 86.49% <100.00%> (+0.02%) ⬆️

... and 7 files with indirect coverage changes

@sonarcloud
Copy link

sonarcloud bot commented Sep 14, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell E 1 Code Smell

100.0% 100.0% Coverage
0.0% 0.0% Duplication

idea Catch issues before they fail your Quality Gate with our IDE extension sonarlint SonarLint

@mgallien mgallien merged commit da24046 into stable-3.9 Sep 14, 2023
9 of 10 checks passed
@mgallien mgallien deleted the backport/6059/stable-3.9 branch September 14, 2023 21:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgallien mgallien mgallien approved these changes

@allexzander allexzander Awaiting requested review from allexzander

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nextcloud-desktop-bot @mgallien