lib/model: More precise deletion detection (fixes #2571, fixes #4573) #4765
Conversation
This file contains 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
calmh
approved these changes
Feb 15, 2018
lib/model/model.go
Outdated
| @@ -2066,6 +2064,14 @@ func (m *Model) internalScanFolderSubdirs(ctx context.Context, folder string, su | |||
| Deleted: true, | |||
| Version: f.Version.Update(m.shortID), | |||
| } | |||
| // We do not want to override the global version | |||
There was a problem hiding this comment.
Move the comment inside the if, I was super confused about why we would not want to override the global file until I read on and realized it was for a corner case.
It's also confusing that we are inside an !f.IsInvalid() case and yet it may be invalid, but I guess that's Ok...
There was a problem hiding this comment.
I dropped the if entirely from this PR. That is the change of behaviour introduced in #4750 and thus should be done there (didn't realize it when splitting this PR from the other one).
|
I just run this PR together with the send-only metadata PR on my system and it ran smoothly. Is this (still) good to go? |
imsodin
added a commit
to imsodin/syncthing
that referenced
this pull request
Feb 25, 2018
This completes syncthing#4750 as a followup to syncthing#4765.
calmh
pushed a commit
that referenced
this pull request
Feb 25, 2018
calmh
added a commit
to calmh/syncthing
that referenced
this pull request
Mar 11, 2018
* master: (31 commits) cmd/syncthing, lib/db: Be nicer about dropping deltas on upgrade (syncthing#4798) gui, man: Update docs & translations cmd/stdiscosrv: Record time of failed lookup cmd/stdiscosrv: Expose process metrics test: Update conflict tests gui: In remote need use index and auto-expand if only one folder (fixes syncthing#4759) (syncthing#4781) gui, man: Update docs & translations cmd/syncthing: Reset delta indexes on upgrade lib/connections: Fix relay connections when two devices use the same relay (fixes syncthing#4778) (syncthing#4779) lib/scanner: Track modified by in symlinks (syncthing#4777) lib/model: Mark deleted file as conflicting when un-ignoring (syncthing#4776) lib/config, lib/model: Auto adjust pullers based on desired amount of pending data (syncthing#4748) lib: Handle metadata changes for send-only folders (fixes syncthing#4616, fixes syncthing#4627) (syncthing#4750) lib/model: More precise deletion detection (fixes syncthing#2571, fixes syncthing#4573) (syncthing#4765) lib/model: Don't panic if block size in index is larger than protocol block size all: Fix typos (syncthing#4772) cmd/strelaysrv: Don't patch the default HTTP client (fixes syncthing#4745) cmd/strelaypoolsrv: Return better error codes and messages (syncthing#4770) lib/fs, vendor: s/zillode/Zillode/ cmd/syncthing: Fix help text for STRECHECKDBEVERY (fixes syncthing#4764) ...
st-review
added
the
frozen-due-to-age
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This fixes the same issues as #4584 but without the combined db/fs scan. The basic idea is to only mark files as deleted, if we really are sure they are deleted. I.e. only if the lstat error is
IsNotExistor a parent is a link/file.