Port consul changes to snapshot #4
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
added 2 commits
June 2, 2020 18:20
Consul has made some minor improvements in handling truncated and invalid snapshots as well as handling gzip closing changes.
notnoop
commented
Jun 3, 2020
| @@ -172,11 +172,11 @@ func Verify(in io.Reader) (*raft.SnapshotMeta, error) { | |||
| // The docs for gzip.Reader say: "Clients should treat data returned by Read as | |||
| // tentative until they receive the io.EOF marking the end of the data." | |||
| func concludeGzipRead(decomp *gzip.Reader) error { | |||
| extra, err := ioutil.ReadAll(decomp) // ReadAll consumes the EOF | |||
| extra, err := io.Copy(ioutil.Discard, decomp) // Copy consumes the EOF | |||
There was a problem hiding this comment.
This is an add-on change, not from consul.
briankassouf
approved these changes
Jun 5, 2020
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.
Since extracting this package, Consul has made some minor improvements in handling truncated and invalid snapshots as well as handling gzip closing changes.
This captures changes in hashicorp/consul#7697