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
794628d4
Commit
794628d4
authored
Jan 25, 2016
by
Willem Thiart
Browse files
raft_recv_appendentries accepts NULL node
parent
36adcc92
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/raft_server.c
View file @
794628d4
...
...
@@ -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"
,
...
...
@@ -195,6 +192,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:
...
...
@@ -268,9 +269,6 @@ int raft_recv_appendentries(
{
raft_server_private_t
*
me
=
(
raft_server_private_t
*
)
me_
;
assert
(
node
);
assert
(
node
!=
me
->
node
);
me
->
timeout_elapsed
=
0
;
if
(
0
<
ae
->
n_entries
)
...
...
@@ -528,7 +526,8 @@ int raft_recv_entry(raft_server_t* me_,
raft_append_entry
(
me_
,
&
ety
);
for
(
i
=
0
;
i
<
me
->
num_nodes
;
i
++
)
{
if
(
me
->
node
==
me
->
nodes
[
i
]
||
!
raft_node_is_voting
(
me
->
nodes
[
i
]))
if
(
me
->
node
==
me
->
nodes
[
i
]
||
!
me
->
nodes
[
i
]
||
!
raft_node_is_voting
(
me
->
nodes
[
i
]))
continue
;
/* Only send new entries.
...
...
tests/test_server.c
View file @
794628d4
...
...
@@ -694,6 +694,18 @@ void TestRaft_follower_recv_appendentries_reply_false_if_term_less_than_currentt
CuAssertTrue
(
tc
,
-
1
==
raft_get_current_leader
(
r
));
}
void
TestRaft_follower_recv_appendentries_does_not_need_node
(
CuTest
*
tc
)
{
void
*
r
=
raft_new
();
raft_add_node
(
r
,
NULL
,
1
,
1
);
raft_add_node
(
r
,
NULL
,
2
,
0
);
msg_appendentries_t
ae
=
{};
ae
.
term
=
1
;
msg_appendentries_response_t
aer
;
raft_recv_appendentries
(
r
,
NULL
,
&
ae
,
&
aer
);
CuAssertTrue
(
tc
,
1
==
aer
.
success
);
}
/* TODO: check if test case is needed */
void
TestRaft_follower_recv_appendentries_updates_currentterm_if_term_gt_currentterm
(
CuTest
*
tc
)
...
...
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