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
84ac58a4
Commit
84ac58a4
authored
Jun 13, 2018
by
Willem Thiart
Browse files
Revert node check
This fixes the virtraft checks.
parent
236f281b
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/raft_server.c
View file @
84ac58a4
...
...
@@ -742,6 +742,7 @@ int raft_recv_entry(raft_server_t* me_,
int e = raft_append_entry(me_, ety);
if (0 != e)
return e;
for (i = 0; i < me->num_nodes; i++)
{
raft_node_t* node = me->nodes[i];
...
...
@@ -1142,9 +1143,7 @@ void raft_offer_log(raft_server_t* me_, raft_entry_t* ety, const int idx)
break;
case RAFT_LOGTYPE_ADD_NODE:
if
(
!
node
)
{
node
=
raft_add_node
(
me_
,
NULL
,
node_id
,
is_self
);
}
node = raft_add_node(me_, NULL, node_id, is_self);
assert(node);
assert(raft_node_is_voting(node));
break;
...
...
tests/test_server.c
View file @
84ac58a4
...
...
@@ -82,14 +82,6 @@ static int __raft_log_offer(raft_server_t* raft,
raft_entry_t
*
entry
,
int
entry_idx
)
{
switch
(
entry
->
type
)
{
case
RAFT_LOGTYPE_ADD_NONVOTING_NODE
:
raft_add_non_voting_node
(
raft
,
NULL
,
atoi
(
entry
->
data
.
buf
),
0
);
break
;
case
RAFT_LOGTYPE_ADD_NODE
:
raft_add_node
(
raft
,
NULL
,
atoi
(
entry
->
data
.
buf
),
0
);
break
;
}
return
0
;
}
...
...
@@ -3963,10 +3955,10 @@ void TestRaft_leader_recv_appendentries_response_set_has_sufficient_logs_after_v
.
type
=
RAFT_LOGTYPE_ADD_NONVOTING_NODE
};
msg_entry_response_t
etyr
;
raft_recv_entry
(
r
,
&
ety
,
&
etyr
);
CuAssertIntEquals
(
tc
,
0
,
raft_recv_entry
(
r
,
&
ety
,
&
etyr
)
)
;
ety
.
id
++
;
ety
.
data
.
buf
=
"3"
;
raft_recv_entry
(
r
,
&
ety
,
&
etyr
);
CuAssertIntEquals
(
tc
,
0
,
raft_recv_entry
(
r
,
&
ety
,
&
etyr
)
)
;
msg_appendentries_response_t
aer
=
{
.
term
=
1
,
.
success
=
1
,
.
current_idx
=
2
,
.
first_idx
=
0
...
...
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