Skip to content

fix(upload): skip locked files during upload to avoid errors#9810

Merged
mgallien merged 5 commits intomasterfrom
bugfix/uploadLockedFiles
Apr 27, 2026
Merged

fix(upload): skip locked files during upload to avoid errors#9810
mgallien merged 5 commits intomasterfrom
bugfix/uploadLockedFiles

Conversation

@mgallien
Copy link
Copy Markdown
Collaborator

@mgallien mgallien commented Apr 8, 2026

No description provided.

@mgallien mgallien added this to the 34.0.0 milestone Apr 8, 2026
@mgallien
Copy link
Copy Markdown
Collaborator Author

mgallien commented Apr 8, 2026

/backport to stable-33.0

Comment thread src/libsync/propagateuploadv1.cpp Outdated
@mgallien mgallien force-pushed the bugfix/uploadLockedFiles branch 2 times, most recently from 1e244ba to 0325789 Compare April 8, 2026 16:44
@mgallien mgallien force-pushed the bugfix/uploadLockedFiles branch 7 times, most recently from 8c3e1f0 to 6436f6e Compare April 18, 2026 07:54
@mgallien mgallien requested a review from nilsding April 18, 2026 08:02
@mgallien mgallien force-pushed the bugfix/uploadLockedFiles branch 3 times, most recently from c4b636a to fa1fd11 Compare April 20, 2026 14:33
Comment thread src/libsync/discovery.cpp Outdated
Comment thread src/csync/csync_exclude.cpp Outdated
Comment thread src/libsync/localdiscoverytracker.cpp
@mgallien mgallien modified the milestones: 34.0.0, 33.0.3 Apr 23, 2026
@mgallien mgallien force-pushed the bugfix/uploadLockedFiles branch from fa1fd11 to 8c96074 Compare April 23, 2026 07:32
@mgallien mgallien requested a review from nilsding April 23, 2026 07:39
@mgallien mgallien force-pushed the bugfix/uploadLockedFiles branch 3 times, most recently from 74d23c4 to 6259d06 Compare April 27, 2026 10:29
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
will ensure we watch them and sync them as soon as they are no longer
locked

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
fix behavior to match expectations from existing automated tests

ignoring locked files that would have been uploaded (i.e. not
downloaded)

ignoring locked files that have not match another ignore rule

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/uploadLockedFiles branch from 6259d06 to e55cb6b Compare April 27, 2026 10:34
@github-actions
Copy link
Copy Markdown

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

Digest: sha256:81ad31967e7edf728fbb96cd4c599f7f97db6ae8040ad196a177c81f5ec63ebd

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.

@sonarqubecloud
Copy link
Copy Markdown

❌ The last analysis has failed.

See analysis details on SonarQube Cloud

@mgallien mgallien enabled auto-merge April 27, 2026 11:53
@mgallien mgallien merged commit 70cb618 into master Apr 27, 2026
22 of 24 checks passed
@mgallien mgallien deleted the bugfix/uploadLockedFiles branch April 27, 2026 11:56
@mgallien mgallien modified the milestones: 33.0.3, 34.0.0 Apr 27, 2026
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.

2 participants