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
a5f3ab69
Commit
a5f3ab69
authored
Jan 03, 2016
by
Willem Thiart
Browse files
Allow NULL node for recv requestvote
parent
cec2bb99
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/raft_server.c
View file @
a5f3ab69
...
...
@@ -167,9 +167,6 @@ int raft_recv_appendentries_response(raft_server_t* me_,
{
raft_server_private_t
*
me
=
(
raft_server_private_t
*
)
me_
;
assert
(
node
);
assert
(
node
!=
me
->
node
);
__log
(
me_
,
node
,
"received appendentries response %s ci:%d rci:%d 1stidx:%d"
,
r
->
success
==
1
?
"SUCCESS"
:
"fail"
,
...
...
@@ -191,6 +188,10 @@ int raft_recv_appendentries_response(raft_server_t* me_,
else
if
(
me
->
current_term
!=
r
->
term
)
return
0
;
/* stop processing, this is a node we don't have in our configuration */
if
(
!
node
)
return
0
;
if
(
0
==
r
->
success
)
{
/* If AppendEntries fails because of log inconsistency:
...
...
@@ -280,8 +281,6 @@ int raft_recv_appendentries(
ae
->
prev_log_term
,
ae
->
n_entries
);
printf
(
"recv ae %p %p
\n
"
,
node
,
raft_get_current_leader_node
(
me_
));
r
->
term
=
me
->
current_term
;
if
(
raft_is_candidate
(
me_
)
&&
me
->
current_term
==
ae
->
term
)
...
...
@@ -468,9 +467,6 @@ int raft_recv_requestvote_response(raft_server_t* me_,
{
raft_server_private_t
*
me
=
(
raft_server_private_t
*
)
me_
;
assert
(
node
);
assert
(
node
!=
me
->
node
);
__log
(
me_
,
node
,
"node responded to requestvote status: %s"
,
r
->
vote_granted
==
1
?
"granted"
:
"not granted"
);
...
...
@@ -498,7 +494,8 @@ int raft_recv_requestvote_response(raft_server_t* me_,
if
(
1
==
r
->
vote_granted
)
{
raft_node_vote_for_me
(
node
,
1
);
if
(
node
)
raft_node_vote_for_me
(
node
,
1
);
int
votes
=
raft_get_nvotes_for_me
(
me_
);
if
(
raft_votes_is_majority
(
me
->
num_nodes
,
votes
))
raft_become_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