logstore: funnel all raft log deletions through logstore package #169640
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -271,25 +271,29 @@ func (t *WAGTruncator) maybeAdvanceAllowedIndex() { | |
| } | ||
| } | ||
|
|
||
| // clearReplicaRaftLogAndSideloaded clears raft log entries at or below the | ||
| // given index for a destroyed or subsumed replica, and it also deletes the | ||
| // sideloaded files associated with the deleted entries. | ||
| func (t *WAGTruncator) clearReplicaRaftLogAndSideloaded( | ||
| ctx context.Context, raft Raft, rangeID roachpb.RangeID, lastIndex kvpb.RaftIndex, | ||
| ) error { | ||
| prefixBuf := keys.MakeRangeIDPrefixBuf(rangeID) | ||
| // We want to delete all raft log entries < hi. Since Raft log doesn't have | ||
| // holes, we can get the first index, calculate the log size, and call | ||
| // ClearRangeSizeKnown(). If no entries exist in [RaftLogPrefix, hi) (e.g., | ||
|
Contributor
Author
There was a problem hiding this comment.
|
||
| // this replica never received entries) this operation is a no-op. | ||
| hi := lastIndex + 1 | ||
| lo, ok, err := firstRaftLogIndex(ctx, raft.RO, prefixBuf, hi) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "finding first raft log index for r%d", rangeID) | ||
| } | ||
| if ok { | ||
| if err := logstore.ClearRangeSizeKnown( | ||
| raft.WO, prefixBuf.RaftLogPrefix(), lo, hi, ClearRangeThresholdPointKeys(), | ||
| logstore.UseRaftLogSingleDelete(t.eng.Separated()), | ||
| ); err != nil { | ||
| return errors.Wrapf(err, "clearing raft log entries for r%d", rangeID) | ||
| } | ||
| } | ||
|
|
||
| // In general, we shouldn't delete sideloaded files before committing the | ||
|
|
@@ -312,39 +316,38 @@ func (t *WAGTruncator) clearReplicaRaftLogAndSideloaded( | |
| return ss.Sync() | ||
| } | ||
|
|
||
| // firstRaftLogIndex returns the smallest raft log index in [RaftLogPrefix, hi) | ||
| // that exists. | ||
| // Returns a boolean indicating whether the raft log index was found or not. If | ||
| // yes, it returns the index. | ||
| func firstRaftLogIndex( | ||
| ctx context.Context, r storage.Reader, prefixBuf keys.RangeIDPrefixBuf, hi kvpb.RaftIndex, | ||
| ) (kvpb.RaftIndex, bool, error) { | ||
| start := prefixBuf.RaftLogPrefix().Clone() | ||
| end := prefixBuf.RaftLogKey(hi).Clone() | ||
| iter, err := r.NewEngineIterator(ctx, storage.IterOptions{ | ||
| KeyTypes: storage.IterKeyTypePointsOnly, | ||
| LowerBound: start, | ||
| UpperBound: end, | ||
| }) | ||
| if err != nil { | ||
| return 0, false, err | ||
| } | ||
| defer iter.Close() | ||
| ok, err := iter.SeekEngineKeyGE(storage.EngineKey{Key: start}) | ||
| if err != nil { | ||
| return 0, false, err | ||
| } | ||
| if !ok { | ||
| return 0, false, nil // no raft entry was found in the [0, hi) span. | ||
| } | ||
| key, err := iter.UnsafeEngineKey() | ||
| if err != nil { | ||
| return 0, false, err | ||
| } | ||
| lo, err := keys.DecodeRaftLogKeyFromSuffix(key.Key[len(start):]) | ||
| if err != nil { | ||
| return 0, false, err | ||
| } | ||
| return lo, true, nil | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could make
hiknown here if theDestroyReplicaInfopasses down the log's last index. Dunno if we want to do it (it's "safer" to clear the whole suffix pretending we don't know where it ends), but it's a possibility.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
True. I want this PR to be as much of a mechanical refactor as possible. I left a TODO to address this in another PR