Skip to content

Ensure that the file being processed has had its etag properly sanitised, log etag more#4940

Merged
mgallien merged 1 commit into
masterfrom
bugfix/debug-conflict
Sep 15, 2022
Merged

Ensure that the file being processed has had its etag properly sanitised, log etag more#4940
mgallien merged 1 commit into
masterfrom
bugfix/debug-conflict

Conversation

@claucambra

@claucambra claucambra commented Sep 14, 2022 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Might address nextcloud/server#33785

@tobiasKaminsky

Signed-off-by: Claudio Cambra claudio.cambra@gmail.com

@claucambra claucambra self-assigned this Sep 14, 2022
@claucambra

claucambra commented Sep 14, 2022

Copy link
Copy Markdown
Collaborator Author

/backport to stable-3.6

mgallien
mgallien reviewed Sep 14, 2022
View reviewed changes
Comment thread src/libsync/discovery.cpp Outdated
@tobiasKaminsky

tobiasKaminsky commented Sep 14, 2022

Copy link
Copy Markdown
Member

Thanks, I am testing it right now

@claucambra claucambra force-pushed the bugfix/debug-conflict branch from b815ffd to 8bf4127 Compare September 14, 2022 13:03
@tobiasKaminsky

tobiasKaminsky commented Sep 14, 2022

Copy link
Copy Markdown
Member

This seems to be way better, but now "only" root one folder's etag keeps changing.
I can see also via web ui that modification date is always "a few seconds ago", while files/folders inside this folder have "13 days ago".
Files/folders next to the problematic folder, which are also synced, do not have a flipping eTag…

@tobiasKaminsky

tobiasKaminsky commented Sep 14, 2022

Copy link
Copy Markdown
Member

Hm. This seems to be unrelated to client, as it happens also in this case:

  • note down etag: 123
  • stop client
  • refresh parent folder (where problematic folder is in) -> no change
  • open folder via web
  • see changing eTag

--> so it is enough to enter this folder to have a flipping etag

@claucambra @mgallien
Ensure that the file being processed has had its etag properly saniti…
0a2186f 
…sed, log etag more

Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
@mgallien mgallien force-pushed the bugfix/debug-conflict branch from 8bf4127 to 0a2186f Compare September 15, 2022 07:10
@nextcloud-desktop-bot

nextcloud-desktop-bot commented Sep 15, 2022

Copy link
Copy Markdown

AppImage file: nextcloud-PR-4940-0a2186f8d9bc1d513669eb00b0a8a6af50caec4a-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.

@sonarqubecloud

sonarqubecloud Bot commented Sep 15, 2022

Copy link
Copy Markdown

SonarCloud Quality Gate failed.    Quality Gate failed

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

8.3% 8.3% Coverage
0.0% 0.0% Duplication

@codecov

codecov Bot commented Sep 15, 2022

Copy link
Copy Markdown

Codecov Report

Merging #4940 (0a2186f) into master (c4b6eae) will increase coverage by 0.00%.
The diff coverage is 92.85%.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master    #4940   +/-   ##
=======================================
  Coverage   57.20%   57.20%           
=======================================
  Files         138      138           
  Lines       17138    17155   +17     
=======================================
+ Hits         9803     9813   +10     
- Misses       7335     7342    +7
Impacted Files Coverage Δ
src/libsync/discovery.cpp 84.32% <92.85%> (-0.24%) ⬇️
src/libsync/vfs/cfapi/cfapiwrapper.cpp 74.20% <0.00%> (-0.46%) ⬇️
src/libsync/propagatedownload.cpp 65.03% <0.00%> (ø)

@mgallien mgallien merged commit 1c5320a into master Sep 15, 2022
@mgallien mgallien deleted the bugfix/debug-conflict branch September 15, 2022 08:36
@backportbot-nextcloud backportbot-nextcloud Bot mentioned this pull request Sep 15, 2022
Merged
@mgallien mgallien added this to the 3.7.0 milestone Oct 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mgallien mgallien mgallien approved these changes
@camilasan camilasan Awaiting requested review from camilasan camilasan is a code owner
@allexzander allexzander Awaiting requested review from allexzander

Assignees

@claucambra claucambra

Labels

None yet

Projects

None yet

Milestone

3.7.0

Development

Successfully merging this pull request may close these issues.

4 participants

@claucambra @tobiasKaminsky @nextcloud-desktop-bot @mgallien