lib/model: Fix enc file size when pulling (fixes #7152) #7155
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
Excellent detective work |
calmh
approved these changes
Nov 25, 2020
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The problem in #7152 is the trailer we add to the file containing the encrypted file info and the connected file size change: We adjust that when actually pulling the file. On index retransfer, we get a new global file, as the version always changes when encrypting a file info. That triggers a pull, but as the contents didn't change, that can be shortcutted. In the shortcut we do not adjust the filesize. So on next scan, the scanner notices the changed file size and thus the file gets marked as locally changed.
Now the file size adjustment happens in the db updater routine of the puller, not in the shared puller state.