raft: Avoid scanning raft log in become_leader #15
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
BusyJay
changed the title
|
Great work @csmoe PTAL @Hoverbear @BusyJay |
BusyJay
reviewed
Jan 23, 2018
src/raft.rs
Outdated
| // pending log entries, and scanning the entire tail of the log | ||
| // could be expensive. | ||
| if ents.len() > 0 { | ||
| self.pending_conf_index = ents[0].get_index() + ents.len() as u64 - 1; |
There was a problem hiding this comment.
You can use ents.last().map_or(0, |e| e.get_index()).
src/raft.rs
Outdated
| @@ -1819,7 +1826,8 @@ impl<T: Storage> Raft<T> { | |||
| } | |||
|
|
|||
| pub fn should_bcast_commit(&self) -> bool { | |||
| !self.skip_bcast_commit || self.pending_conf | |||
| let last_index = self.raft_log.last_index(); | |||
| !self.skip_bcast_commit || (self.pending_conf_index == last_index) | |||
There was a problem hiding this comment.
I think it should be self.pending_conf_index > self.raft_log.applied.
BusyJay
reviewed
Jan 24, 2018
src/raft.rs
Outdated
| // safe to delay any future proposals until we commit all our | ||
| // pending log entries, and scanning the entire tail of the log | ||
| // could be expensive. | ||
| if ents.len() > 0 { |
There was a problem hiding this comment.
The check is unnecessary anymore.
| @@ -1819,7 +1826,7 @@ impl<T: Storage> Raft<T> { | |||
| } | |||
|
|
|||
| pub fn should_bcast_commit(&self) -> bool { | |||
| !self.skip_bcast_commit || self.pending_conf | |||
| !self.skip_bcast_commit || (self.pending_conf_index > self.raft_log.applied) | |||
|
any update @csmoe |
|
@siddontang sorry for the delay. I'm trying to figure out the tests for |
siddontang
reviewed
Jan 28, 2018
tests/cases/test_raw_node.rs
Outdated
| @@ -429,6 +429,11 @@ fn test_skip_bcast_commit() { | |||
| // elect r1 as leader | |||
| nt.send(vec![new_message(1, 1, MessageType::MsgHup, 0)]); | |||
|
|
|||
| // Skip bcast commit when pending_conf_index <= applied | |||
There was a problem hiding this comment.
can we check the result of should_bcast_commit here?
csmoe
force-pushed
the
avoid-scanning-raft-log-in-become_leader
branch
from
f98ab5f
to
0f0b42e
Compare
BusyJay
approved these changes
Feb 2, 2018
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.
should resolve issue #11
modifications based on pull request etcd-io/etcd#9073