[NotMerge] another fix of 20271 #20585
Closed
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.
Please read https://github.com/etcd-io/etcd/blob/main/CONTRIBUTING.md#contribution-flow.
for #20271 , related to #20553
This PR also can pass #20503 , but with a shorter lock range.
In this PR, I moved
OpenSnapshotBackend
logic intobackend
instance. So that thedefrag
andReopenFromSnapshotFile
could be controlled by locks(batchTx, mu, readTx) inbackend
.In
applySnapshot
process, there is no need to close old backend, becausedb
file is replaced in place inside old backend.s.consistIndex.SetBackend(newbe)
has to be moved up, because it would fail to verity previous and current cindex in theunsafeUpdateConsistentIndex
function if it is not.I think
defrag
would not change logic data, so it is safe to happen during any part of restoring, e.g. kv restore, lessor restore, alarm restore.This is not final PR, just a provement of thoughts.
cc @fuweid @ahrtr