fix(file-provider): detect lock changes during working set enumeration.#10002
Merged
Conversation
Member
Author
|
/backport to stable-33.0 |
camilasan
force-pushed
the
bugfix/locking
branch
5 times, most recently
from
61cb22e to
5a2da8c
Compare
Collaborator
|
I saw this only now after checking the milestone. I will review tomorrow. |
github-project-automation
Bot
moved this to 🧭 Planning evaluation (don't pick)
in 💻 Desktop Clients team
i2h3
moved this from 🧭 Planning evaluation (don't pick)
to 🏗️ In progress
in 💻 Desktop Clients team
i2h3
approved these changes
May 13, 2026
Nextcloud file locking does not update etags, so the previous optimisation that skipped child directories with unchanged etags silently hid lock state changes on nested files. Only skip directories that are both unchanged and have no materialised descendants. Also preserve lockToken and visitedDirectory in the target depth read path, matching the other two code paths. Signed-off-by: Camila Ayres <hello@camilasan.com>
Add simple unit test for isInSameDatabaseStoreableRemoteState. Use unique identifiers in lockToken test. Set creationDate in toNKFile() to match toItemMetadata(). Signed-off-by: Camila Ayres <hello@camilasan.com>
Contributor
|
Artifact containing the AppImage: nextcloud-appimage-pr-10002.zip Digest: To test this change/fix you can download the above artifact file, unzip it, and run it. Please make sure to quit your existing Nextcloud app and backup your data. |
|
github-project-automation
Bot
moved this from 🏗️ In progress
to ☑️ Done
in 💻 Desktop Clients team
8 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolves
Lock state changes weren't synced between web and Finder because Nextcloud locking doesn't update etags, and the working set enumeration skipped directories with unchanged etags.
Solution: Only skip unchanged directories with no materialised descendants, so directories containing visible files are always re-enumerated. Also preserve lockToken and visitedDirectory in the target-depth read path.
#10011 makes sure visited directories stay in the materialised set, and #10002 makes sure those directories are actually enumerated when they have visible descendants (rather than being skipped due to unchanged etags). Without #10011, a directory could silently lose its visitedDirectory flag on eviction and drop out of the working set entirely. Without #10002, even if it stays in the set, lock changes would still be invisible.
Summary
TODO
Checklist
AI (if applicable)