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

maintain lock state if unlock happens during sync #6236

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

mgallien
Copy link
Collaborator

currently unlock can happen during the sync
in that case, it may be possible that the propagator will lose the lock state changes and override them when updating teh etag after a file has been uploaded

detect that case and ensure we keep consistent state about files

@mgallien mgallien force-pushed the bugfix/fixLockStateWhenUnlockHappensDuringSync branch from 6e84541 to 5c67c9b Compare December 4, 2023 16:12
@mgallien mgallien requested a review from claucambra December 4, 2023 16:12
@mgallien mgallien force-pushed the bugfix/fixLockStateWhenUnlockHappensDuringSync branch from 5c67c9b to c26dc38 Compare December 5, 2023 07:50
currently unlock can happen during the sync
in that case, it may be possible that the propagator will lose the lock
state changes and override them when updating teh etag after a file has
been uploaded

detect that case and ensure we keep consistent state about files

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/fixLockStateWhenUnlockHappensDuringSync branch from c26dc38 to 1dcde3a Compare December 5, 2023 07:57
@mgallien mgallien merged commit 54706dc into master Dec 5, 2023
7 of 10 checks passed
@mgallien mgallien deleted the bugfix/fixLockStateWhenUnlockHappensDuringSync branch December 5, 2023 07:57
@mgallien
Copy link
Collaborator Author

mgallien commented Dec 5, 2023

/backport to stable-3.10

Copy link

sonarcloud bot commented Dec 5, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

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

No Coverage information No Coverage information
No Duplication information No Duplication information

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6236-1dcde3a41fc9c911d1a562d33508315829d1f89a-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 added this to the 3.11.0 milestone Dec 12, 2023
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.

3 participants