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.

Sign up for GitHub

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

Jump to bottom

Bugfix/fix vfs folder state when remote move is forbidden #6717

Merged
merged 2 commits into from
Sep 16, 2024
Merged

Bugfix/fix vfs folder state when remote move is forbidden #6717

merged 2 commits into from
Sep 16, 2024

Conversation

mgallien
Copy link
Collaborator

No description provided.

@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from d1aef86 to 7275b8a Compare May 2, 2024 08:54
claucambra
claucambra requested changes May 4, 2024
View reviewed changes
Copy link
Collaborator

@claucambra claucambra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like there are some unrelated changes from #6718

@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from 7275b8a to b058995 Compare May 6, 2024 10:13
@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch 2 times, most recently from c9d76f7 to 9202dfd Compare May 16, 2024 13:42
@mgallien mgallien requested a review from claucambra May 16, 2024 13:42
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented May 16, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
D Maintainability Rating on New Code (required ≥ A)
17 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

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

@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from 9202dfd to 91307ce Compare August 7, 2024 10:57
@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from 91307ce to 3b8d021 Compare August 20, 2024 13:38
@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from 3b8d021 to 80bf451 Compare September 12, 2024 07:40
@mgallien
ensure proper VFS metadata when restoring folders
da920f6 
when remote move is forbidden, desktop client will move back the folder
to its original name

in such cases, we were forgetting to set VFS metadata in their proper
state (i.e. placeholder in sync)

so ensure that when a remote move fails, we still touch VFS metadata
when appropriate and handle errors

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien
as a last resort, try to update VFS metadata of folders when discovered
7a6691f 
when doing local discovery, it is possible that files or folders may be
discovered with VFS metadata not up to date (i.e. placeholder file not
set in sync)

in such case, generate a propagation instruction to set them in sync

Signed-off-by: Matthieu Gallien <[email protected]>
@mgallien mgallien force-pushed the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch from 80bf451 to 7a6691f Compare September 16, 2024 10:10
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-6717-7a6691f6e04a62fdbd0b9573ca5a2f59af7e8633-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.

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Sep 16, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
E Maintainability Rating on New Code (required ≥ A)
26 New Code Smells (required ≤ 0)

See analysis details on SonarCloud

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

@mgallien mgallien merged commit ac8506c into master Sep 16, 2024
11 of 15 checks passed
@mgallien mgallien deleted the bugfix/fixVfsFolderStateWhenRemoteMoveIsForbidden branch September 16, 2024 15:31
@mgallien
Copy link
Collaborator Author

/backport to stable-3.14

@mgallien
Copy link
Collaborator Author

/backport to stable-3.13

@mgallien
Copy link
Collaborator Author

/backport to stable-3.12

@backportbot backportbot
Copy link

backportbot bot commented Sep 16, 2024

The backport to stable-3.12 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable-3.12
git pull origin stable-3.12

# Create the new backport branch
git checkout -b backport/6717/stable-3.12

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick da920f6d 7a6691f6

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/6717/stable-3.12

Error: Failed to push branch backport/6717/stable-3.12: fatal: could not read Username for 'https://github.com': No such device or address

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot mentioned this pull request Sep 16, 2024
Merged
@backportbot backportbot bot mentioned this pull request Sep 16, 2024
Merged
2 tasks
@mgallien mgallien mentioned this pull request Sep 16, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@camilasan camilasan camilasan approved these changes

@allexzander allexzander Awaiting requested review from allexzander

@claucambra claucambra Awaiting requested review from claucambra

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@mgallien @nextcloud-desktop-bot @camilasan @claucambra