-
Notifications
You must be signed in to change notification settings - Fork 168
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Allow reuse of slices exposed through Ready #51
Open
CaojiamingAlan
wants to merge
2
commits into
etcd-io:main
Choose a base branch
from
CaojiamingAlan:reuse_of_slices_exposed_through_Ready
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -252,9 +252,19 @@ func newStorageAppendMsg(r *raft, rd Ready) pb.Message { | |
// be contained in msgsAfterAppend). This ordering allows the MsgAppResp | ||
// handling to use a fast-path in r.raftLog.term() before the newly appended | ||
// entries are removed from the unstable log. | ||
m.Responses = r.msgsAfterAppend | ||
|
||
// msgsAfterAppend is a pooled slice, so we need to make a deep copy | ||
msgsCount, needResp := len(r.msgsAfterAppend), false | ||
if needStorageAppendRespMsg(r, rd) { | ||
m.Responses = append(m.Responses, newStorageAppendRespMsg(r, rd)) | ||
msgsCount++ | ||
needResp = true | ||
} | ||
if msgsCount != 0 { | ||
// NB: allocating precisely as much as needed. | ||
m.Responses = append(make([]pb.Message, 0, msgsCount), r.msgsAfterAppend...) | ||
if needResp { | ||
m.Responses = append(m.Responses, newStorageAppendRespMsg(r, rd)) | ||
} | ||
} | ||
return m | ||
} | ||
|
@@ -428,6 +438,11 @@ func (rn *RawNode) acceptReady(rd Ready) { | |
} | ||
} | ||
rn.raft.msgs = nil | ||
// Release the msgsAfterAppend slice and put it back into the msgsAfterAppendPool. | ||
// This clears the slice but reserves the underlying array, which we can pool and reuse. | ||
if cap(rn.raft.msgsAfterAppend) > 0 { | ||
rn.raft.msgsAfterAppendPool.Put(rn.raft.msgsAfterAppend[:0]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: add a comment explaining the logic of this optimization. Similar to what you've said (#51 (comment)) |
||
} | ||
rn.raft.msgsAfterAppend = nil | ||
rn.raft.raftLog.acceptUnstable() | ||
if len(rd.CommittedEntries) > 0 { | ||
|
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.
why 8?
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.
This is the number used in the example given by #15 (comment) . Actually I don't really know what might be a good number, so adopted that directly.