lib/model: Record error for unavailable files #5066
Merged
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
Currently unavailable files show up as out-of-sync in the UI without any progress or explanation. Now these files will be added to the failed items. The changed count isn't inreased, as there is no point in retrying those files until a change in connection happens. At that point, a pull will be scheduled anyway.
lib/model/folder_sendrecv.go
Outdated
| @@ -353,7 +354,7 @@ func (f *sendReceiveFolder) processNeeded(ignores *ignore.Matcher, dbUpdateChan | |||
| return true | |||
| } | |||
| } | |||
| l.Debugln(f, "Needed file is unavailable", file) | |||
| f.newError("checking availability", file.Name, errNotAvailable) | |||
There was a problem hiding this comment.
Perhaps just pull rather than check availability.
lib/model/folder_sendrecv.go
Outdated
| @@ -66,6 +66,7 @@ var ( | |||
| errDirHasToBeScanned = errors.New("directory contains unexpected files, scheduling scan") | |||
| errDirHasIgnored = errors.New("directory contains ignored files (see ignore documentation for (?d) prefix)") | |||
| errDirNotEmpty = errors.New("directory is not empty") | |||
| errNotAvailable = errors.New("no peers that have this file are connected. Will be retried on next connection.") | |||
There was a problem hiding this comment.
Very long, The crux here is that no connected device has this version of the file
There was a problem hiding this comment.
Or even "latest version of the file"
lib/model/folder_sendrecv.go
Outdated
| @@ -354,7 +353,7 @@ func (f *sendReceiveFolder) processNeeded(ignores *ignore.Matcher, dbUpdateChan | |||
| return true | |||
| } | |||
| } | |||
| f.newError("checking availability", file.Name, errNotAvailable) | |||
| f.newError("processing needed", file.Name, errNotAvailable) | |||
There was a problem hiding this comment.
This is visible in the UI, having processing needed will just make the string very long, just download or pull
AudriusButkevicius
approved these changes
Jul 14, 2018
lib/model/folder_sendrecv.go
Outdated
| @@ -353,7 +353,7 @@ func (f *sendReceiveFolder) processNeeded(ignores *ignore.Matcher, dbUpdateChan | |||
| return true | |||
| } | |||
| } | |||
| f.newError("processing needed", file.Name, errNotAvailable) | |||
| f.newError("pull", file.Name, errNotAvailable) | |||
There was a problem hiding this comment.
We could also add file.ModifiedBy to the error message, explaining who has the file.
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.
Purpose
Currently unavailable files show up as out-of-sync in the UI without any progress
or explanation. Now these files will be added to the failed items. The changed
count isn't inreased, as there is no point in retrying those files until a change
in connection happens. At that point, a pull will be scheduled anyway.
Testing
None.