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.

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

Bugfix/files lock fail metadata #5024

Merged
merged 3 commits into from
Oct 11, 2022
Merged

Conversation

mgallien
Copy link
Collaborator

@mgallien mgallien commented Oct 7, 2022

fixes #5014

@allexzander
Copy link
Contributor

Tested, and it works. Many thanks.

@mgallien mgallien force-pushed the bugfix/filesLockFailMetadata branch 2 times, most recently from 0e38786 to f19d03c Compare October 10, 2022 19:55
@codecov
Copy link

codecov bot commented Oct 10, 2022

Codecov Report

Merging #5024 (9aad1a4) into master (42f6a63) will increase coverage by 0.21%.
The diff coverage is 100.00%.

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

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5024      +/-   ##
==========================================
+ Coverage   57.16%   57.37%   +0.21%     
==========================================
  Files         138      138              
  Lines       17401    17384      -17     
==========================================
+ Hits         9947     9974      +27     
+ Misses       7454     7410      -44     
Impacted Files Coverage Δ
src/libsync/discovery.cpp 83.76% <100.00%> (+0.32%) ⬆️
src/libsync/account.h 29.41% <0.00%> (-3.93%) ⬇️
src/libsync/account.cpp 38.46% <0.00%> (+0.46%) ⬆️
src/libsync/discoveryphase.cpp 73.18% <0.00%> (+0.83%) ⬆️
src/libsync/syncengine.cpp 84.23% <0.00%> (+1.35%) ⬆️
src/libsync/vfs/cfapi/cfapiwrapper.cpp 74.31% <0.00%> (+1.81%) ⬆️
src/libsync/vfs/cfapi/vfs_cfapi.cpp 85.77% <0.00%> (+2.37%) ⬆️
src/libsync/vfs/cfapi/hydrationjob.cpp 56.08% <0.00%> (+3.70%) ⬆️

@mgallien mgallien force-pushed the bugfix/filesLockFailMetadata branch from f19d03c to 9aad1a4 Compare October 11, 2022 06:41
try to ensure that we properly sync again files for which lock has
expired

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/filesLockFailMetadata branch from 9aad1a4 to a096bbd Compare October 11, 2022 14:02
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5024-a096bbd1ff869aa628d98c0a42e7471405e1b41a-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.

@mgallien mgallien merged commit 4ddfaa7 into master Oct 11, 2022
@mgallien mgallien deleted the bugfix/filesLockFailMetadata branch October 11, 2022 19:54
@mgallien mgallien added this to the 3.7.0 milestone Oct 18, 2022
@DanScharon
Copy link

could this be backported to stable-3.6?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Modified files that become locked on server will not be syned correctly
5 participants