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

Do not modify discovered files on disk if not necessary #5872

Merged
merged 8 commits into from
Aug 7, 2023
Merged

Do not modify discovered files on disk if not necessary #5872

merged 8 commits into from
Aug 7, 2023

Conversation

claucambra
Copy link
Collaborator

This prevents the file metadata changing when it doesn't have to, causing conflicts in certain user applications

Close #5842

@claucambra claucambra self-assigned this Jul 7, 2023
@allexzander allexzander self-requested a review July 7, 2023 14:08
allexzander
allexzander suggested changes Jul 7, 2023
View reviewed changes
Copy link
Contributor

@allexzander allexzander left a comment

Choose a reason for hiding this comment

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

Too early for approval, @claucambra kindly check failing test, and do not forget to squash commits, then I can approve, thx

@claucambra
Copy link
Collaborator Author

Too early for approval, @claucambra kindly check failing test, and do not forget to squash commits, then I can approve, thx

Fixed now, feel free to re-review @allexzander

mgallien
mgallien requested changes Jul 10, 2023
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

this is missing an update in automated tests to justify and explain the changes

@claucambra claucambra requested a review from mgallien July 11, 2023 07:45
@claucambra
Copy link
Collaborator Author

this is missing an update in automated tests to justify and explain the changes

Added a test now

mgallien
mgallien requested changes Jul 13, 2023
View reviewed changes
test/syncenginetestutils.h Outdated Show resolved Hide resolved
test/syncenginetestutils.h Outdated Show resolved Hide resolved
@claucambra claucambra force-pushed the work/do-not-mod-new-files-unnecessarily branch from c8d7a42 to dd0faff Compare July 13, 2023 13:04
github-actions[bot]
github-actions bot previously requested changes Jul 13, 2023
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

test/syncenginetestutils.h Outdated Show resolved Hide resolved
test/testsyncengine.cpp Show resolved Hide resolved
@claucambra claucambra force-pushed the work/do-not-mod-new-files-unnecessarily branch from dd0faff to 6bf704c Compare July 13, 2023 13:46
github-actions[bot]
github-actions bot previously requested changes Jul 13, 2023
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

⚠️ clang-tidy found issue(s) with the introduced code (1/1)

test/testsyncengine.cpp Outdated Show resolved Hide resolved
@claucambra claucambra force-pushed the work/do-not-mod-new-files-unnecessarily branch from 6bf704c to 270794e Compare July 13, 2023 14:19
@github-actions github-actions bot dismissed stale reviews from themself July 13, 2023 14:31

No clang-tidy warnings found so I assume my comments were addressed

allexzander
allexzander suggested changes Aug 4, 2023
View reviewed changes
Copy link
Contributor

@allexzander allexzander left a comment

Choose a reason for hiding this comment

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

@claucambra Kindly check why SyncCfApiTest (Failed) is failing

@claucambra claucambra force-pushed the work/do-not-mod-new-files-unnecessarily branch from 270794e to 23f53cf Compare August 4, 2023 12:06
@codecov
Copy link

codecov bot commented Aug 7, 2023 •
edited
Loading

Codecov Report

Merging #5872 (812e696) into master (0a86967) will increase coverage by 0.04%.
The diff coverage is 100.00%.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #5872      +/-   ##
==========================================
+ Coverage   60.06%   60.11%   +0.04%     
==========================================
  Files         145      145              
  Lines       18797    18801       +4     
==========================================
+ Hits        11291    11302      +11     
+ Misses       7506     7499       -7
Files Changed Coverage Δ
src/common/filesystembase.cpp 75.15% <100.00%> (+0.15%) ⬆️
src/libsync/syncengine.cpp 81.18% <100.00%> (+0.07%) ⬆️

... and 2 files with indirect coverage changes

@claucambra
Unify else and if in SyncEngine::slotItemDiscovered for filesystem se…
3214534 
…tmodtime check

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Return bool from FileSystem::setFileReadOnlyWeak depending on whether…
9811d35 
… permission change was actually made or not

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Only change modification time if any modifications were actually made…
fe829e2 
… on downsynced file

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Only attempt conversion to placeholder on new file if VFS enabled in …
961033e 
…SyncEngine::slotItemDiscovered

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Ensure file modification time is set if item modtime differs from jou…
4681d27 
…rnal modtime

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra claucambra force-pushed the work/do-not-mod-new-files-unnecessarily branch from e383140 to 812e696 Compare August 7, 2023 08:25
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5872-812e696d53ef14c326e2312d7007ff40a3d23b3b-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
Copy link

sonarcloud bot commented Aug 7, 2023

SonarCloud Quality Gate failed.    Quality Gate failed

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

100.0% 100.0% Coverage
0.0% 0.0% Duplication

warning The version of Java (11.0.14.1) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

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

@claucambra claucambra merged commit f529dd6 into master Aug 7, 2023
11 of 12 checks passed
@claucambra claucambra deleted the work/do-not-mod-new-files-unnecessarily branch August 7, 2023 09:28
@claucambra
Copy link
Collaborator Author

/backport to stable-3.9

@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Aug 7, 2023
Merged
@allexzander allexzander added this to the 3.9.2 milestone Aug 9, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@github-actions GitHub Actions github-actions left review comments

@camilasan camilasan Awaiting requested review from camilasan

@mgallien mgallien Awaiting requested review from mgallien

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.9.2
Development

Successfully merging this pull request may close these issues.

[Bug]: Desktop Client updates inode status timestamp
4 participants
@claucambra @nextcloud-desktop-bot @mgallien @allexzander