Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
Willemt Raft
Commits
2e2c15ea
Commit
2e2c15ea
authored
May 18, 2016
by
Willem Thiart
Browse files
Refactor: clean up voting change detection
parent
bdabd1d1
Changes
1
Show whitespace changes
Inline
Side-by-side
src/raft_server.c
View file @
2e2c15ea
...
@@ -192,6 +192,11 @@ raft_entry_t* raft_get_entry_from_idx(raft_server_t* me_, int etyidx)
...
@@ -192,6 +192,11 @@ raft_entry_t* raft_get_entry_from_idx(raft_server_t* me_, int etyidx)
return
log_get_at_idx
(
me
->
log
,
etyidx
);
return
log_get_at_idx
(
me
->
log
,
etyidx
);
}
}
int
raft_voting_change_is_in_progress
(
raft_server_t
*
me_
)
{
return
((
raft_server_private_t
*
)
me_
)
->
voting_cfg_change_log_idx
!=
-
1
;
}
int
raft_recv_appendentries_response
(
raft_server_t
*
me_
,
int
raft_recv_appendentries_response
(
raft_server_t
*
me_
,
raft_node_t
*
node
,
raft_node_t
*
node
,
msg_appendentries_response_t
*
r
)
msg_appendentries_response_t
*
r
)
...
@@ -562,7 +567,7 @@ int raft_recv_entry(raft_server_t* me_,
...
@@ -562,7 +567,7 @@ int raft_recv_entry(raft_server_t* me_,
/* Only one voting cfg change at a time */
/* Only one voting cfg change at a time */
if
(
raft_entry_is_voting_cfg_change
(
e
))
if
(
raft_entry_is_voting_cfg_change
(
e
))
if
(
-
1
!=
me
->
voting_
cfg_
change_
log_idx
)
if
(
raft_
voting_change_
is_in_progress
(
me_
)
)
return
RAFT_ERR_ONE_VOTING_CHANGE_ONLY
;
return
RAFT_ERR_ONE_VOTING_CHANGE_ONLY
;
if
(
!
raft_is_leader
(
me_
))
if
(
!
raft_is_leader
(
me_
))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment