[check-log] Ignore broken/unexpected json on reading state #302
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
lufia
reviewed
Oct 24, 2019
| @@ -444,6 +451,8 @@ func getStateFile(stateDir, f string, args []string) string { | |||
| ) | |||
| } | |||
|
|
|||
| var errValidStateFileNotFound = fmt.Errorf("state file not found, or corrupted") | |||
|
|
|||
| func getBytesToSkip(f string) (int64, error) { | |||
| state, err := loadState(f) | |||
There was a problem hiding this comment.
If state file is corrupted, loadState() will return nil, nil.
Is it intended behavior that getBytesToSkipOld will be called to try to read old state file in this case?
There was a problem hiding this comment.
I thought the behavior is not the best but acceptable.
But finally I decided not to read old state file the case faeb49f
| if !opts.NoState { | ||
| s, err := getBytesToSkip(stateFile) | ||
| if err != nil { | ||
| return 0, 0, "", err | ||
| if err != errValidStateFileNotFound { |
There was a problem hiding this comment.
getBytesToSkip can return errValidStateFileNotFound only if getBytesToSkipOld is called.
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
I'm not sure this is the best approach, but worth consider…