Skip to content

Bugfix/better handling of locked files during upload#9566

Merged
mgallien merged 3 commits intomasterfrom
bugfix/betterHandlingOfLockedFilesDuringUpload
Mar 10, 2026
Merged

Bugfix/better handling of locked files during upload#9566
mgallien merged 3 commits intomasterfrom
bugfix/betterHandlingOfLockedFilesDuringUpload

Conversation

@mgallien
Copy link
Collaborator

@mgallien mgallien commented Mar 4, 2026

close #9111

@mgallien mgallien added this to the 33.0.0 milestone Mar 4, 2026
@mgallien mgallien force-pushed the bugfix/betterHandlingOfLockedFilesDuringUpload branch from eaabcb5 to 92ff52f Compare March 4, 2026 15:24
@mgallien
Copy link
Collaborator Author

mgallien commented Mar 4, 2026

possibly related #6131

@mgallien mgallien force-pushed the bugfix/betterHandlingOfLockedFilesDuringUpload branch from 92ff52f to 6c986e9 Compare March 10, 2026 09:59
@mgallien
Copy link
Collaborator Author

/backport to stable-33.0

better version of FileSystem::isLockedFile taken over from
https://github.com/owncloud/client/blob/master/src/common/filesystembase.cpp#L482

adapted our existing code to work with it

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
should prevent critical errors from being reported about a failing
network job while it is only the source file being locked

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/betterHandlingOfLockedFilesDuringUpload branch from 6c986e9 to 98acc88 Compare March 10, 2026 13:52
@github-actions
Copy link

Artifact containing the AppImage: nextcloud-appimage-pr-9566.zip

Digest: sha256:c18890939bb00a68d06c75d06fd68a6458a4b32adcdbd245cfde873f7bee3f68

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.

@mgallien mgallien merged commit 0d6b474 into master Mar 10, 2026
21 of 22 checks passed
@mgallien mgallien deleted the bugfix/betterHandlingOfLockedFilesDuringUpload branch March 10, 2026 14:35
@sonarqubecloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
38.5% Coverage on New Code (required ≥ 80%)
D Maintainability Rating on New Code (required ≥ A)
115 New Code Smells (required ≤ 0)

See analysis details on SonarQube Cloud

Catch issues before they fail your Quality Gate with our IDE extension SonarQube for IDE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Desktop client stops syncing if 1 or more files are locked

2 participants