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

Bugfix/delete folders during propagation even when propagation has errors #5104

Merged
merged 5 commits into from
Nov 7, 2022

Conversation

mgallien
Copy link
Collaborator

do not skip folders to delete in case of errors with blacklisted files

clean up and log improvements

@allexzander
Copy link
Contributor

@mgallien What exactly the issue is and how I can reproduce it?

@mgallien mgallien changed the title Bugfix/do not delete files in sync database Bugfix/delete folder during propagation even when propagation has errors Oct 31, 2022
@mgallien mgallien changed the title Bugfix/delete folder during propagation even when propagation has errors Bugfix/delete folders during propagation even when propagation has errors Oct 31, 2022
@mgallien mgallien force-pushed the bugfix/doNotDeleteFilesInSyncDatabase branch 2 times, most recently from 9ca10b1 to 518be9d Compare October 31, 2022 12:13
@codecov
Copy link

codecov bot commented Oct 31, 2022

Codecov Report

Merging #5104 (34a59fb) into master (9e7a79f) will increase coverage by 0.01%.
The diff coverage is n/a.

❗ Current head 34a59fb differs from pull request most recent head f150643. Consider uploading reports for the commit f150643 to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5104      +/-   ##
==========================================
+ Coverage   57.39%   57.40%   +0.01%     
==========================================
  Files         138      138              
  Lines       17444    17444              
==========================================
+ Hits        10012    10014       +2     
+ Misses       7432     7430       -2     
Impacted Files Coverage Δ
src/libsync/propagatedownload.cpp 64.61% <0.00%> (-0.15%) ⬇️
src/libsync/discovery.cpp 84.05% <0.00%> (+0.28%) ⬆️

@allexzander
Copy link
Contributor

@mgallien Please clean-up the history

@allexzander allexzander force-pushed the bugfix/doNotDeleteFilesInSyncDatabase branch 2 times, most recently from 64f1ba5 to 684d39d Compare November 3, 2022 14:58
@mgallien mgallien force-pushed the bugfix/doNotDeleteFilesInSyncDatabase branch from 684d39d to f150643 Compare November 7, 2022 08:24
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
use nextcloud namespace for discovery logs as it does not show correcly
without that

this is because we have central rules for all logs from nextcloud
namespace

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
in case some propgation actions ends up with a BlacklistedError, we
would skip the deletions of local folders (even though they have been
deleted from server)

let's not skip them but rather keep track of the error status and
properly report them

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/doNotDeleteFilesInSyncDatabase branch from f150643 to 402d959 Compare November 7, 2022 17:33
@sonarcloud
Copy link

sonarcloud bot commented Nov 7, 2022

SonarCloud Quality Gate failed.    Quality Gate failed

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

72.7% 72.7% Coverage
0.0% 0.0% Duplication

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5104-402d959caea89c461366a232e807dced2c712034-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 merged commit b02f112 into master Nov 7, 2022
@mgallien mgallien deleted the bugfix/doNotDeleteFilesInSyncDatabase branch November 7, 2022 22:42
@mgallien mgallien added this to the 3.7.0 milestone Nov 8, 2022
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