fix: restore in-memory Manifest on write error #23552
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
davidby-influx
force-pushed
the
DSB_manifest_lock
branch
from
4e07537 to
8b6991c
Compare
lesam
previously approved these changes
Jul 20, 2022
Also improved test error messages per review comments
davidby-influx
force-pushed
the
DSB_manifest_lock
branch
from
1049e60 to
1fc430d
Compare
lesam
suggested changes
Jul 20, 2022
lesam
reviewed
Jul 20, 2022
tsdb/index/tsi1/partition.go
Outdated
| if err != nil { | ||
| // TODO: Close index if write fails. | ||
| p.logger.Error("manifest file write failed compacting index", zap.String("path", p.ManifestPath()), zap.Error(err)) |
There was a problem hiding this comment.
p.logger vs log here - we should be consistent about which one to log with.
tsdb/index/tsi1/partition.go
Outdated
| if err != nil { | ||
| // TODO: Close index if write fails. | ||
| p.logger.Error("manifest file write failed compacting index", zap.String("path", p.ManifestPath()), zap.Error(err)) |
There was a problem hiding this comment.
We should always either return an error (with appropriate context for the caller) or log the error, but not both. Otherwise we end up logging errors at every level of the call stack.
We can avoid being religious about that for now if necessary, but any time we log an error and then return the error is a code smell for me.
lesam
reviewed
Jul 20, 2022
lesam
reviewed
Jul 20, 2022
tsdb/index/tsi1/partition.go
Outdated
| if err != nil { | ||
| // TODO: Close index if write fails. | ||
| p.logger.Error("manifest file write failed compacting log file", zap.String("path", p.ManifestPath()), zap.Error(err)) |
There was a problem hiding this comment.
p.logger.Error here vs log.Error below.
lesam
approved these changes
Jul 20, 2022
davidby-influx
added a commit
that referenced
this pull request
Jul 20, 2022
davidby-influx
added a commit
that referenced
this pull request
Jul 20, 2022
davidby-influx
added a commit
that referenced
this pull request
Jul 20, 2022
davidby-influx
added a commit
that referenced
this pull request
Jul 20, 2022
davidby-influx
added a commit
that referenced
this pull request
Jul 25, 2022
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.
Do not update the
FileSetoractiveLogFilefield in the in-memoryPartition structure if the Manifest file is not correctly saved to
the disk.
closes #23553