fix: Migrated bucket should have correct retention policy. #17769
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
Signed-off-by: Patrik Helia <patashelia@gmail.com>
benbjohnson
suggested changes
Apr 17, 2020
tsdb/migrate/migrate.go
Outdated
Comment on lines
306
to
318
| f, err := os.Open(file) | ||
| if err != nil { | ||
| if os.IsNotExist(err) { | ||
| return nil, err | ||
| } | ||
| return nil, err | ||
| } | ||
| defer f.Close() | ||
|
|
||
| data, err := ioutil.ReadAll(f) | ||
| if err != nil { | ||
| return nil, err | ||
| } |
There was a problem hiding this comment.
This can all be shortened to:
data, err := ioutil.ReadFile(file)
if err != nil {
return nil, err
}Also, your check for os.IsNotExist(err) on L308 is redundant since both error cases simply return err.
Signed-off-by: Patrik Helia <patrik.helia@kiwi.com>
benbjohnson
approved these changes
Apr 20, 2020
|
@patriczek Thanks for the update to your commit! lgtm |
|
@benbjohnson You are welcome |
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.
This commit fixed that, if is created bucket while migration and the old database had set retention policy, than this policy is used in created bucket.
Closes #17257
Signed-off-by: Patrik Helia patashelia@gmail.com