Commit 84ac58a4 authored by Willem Thiart's avatar Willem Thiart
Browse files

Revert node check

This fixes the virtraft checks.
parent 236f281b
...@@ -742,6 +742,7 @@ int raft_recv_entry(raft_server_t* me_, ...@@ -742,6 +742,7 @@ int raft_recv_entry(raft_server_t* me_,
int e = raft_append_entry(me_, ety); int e = raft_append_entry(me_, ety);
if (0 != e) if (0 != e)
return e; return e;
for (i = 0; i < me->num_nodes; i++) for (i = 0; i < me->num_nodes; i++)
{ {
raft_node_t* node = me->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) ...@@ -1142,9 +1143,7 @@ void raft_offer_log(raft_server_t* me_, raft_entry_t* ety, const int idx)
break; break;
case RAFT_LOGTYPE_ADD_NODE: 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(node);
assert(raft_node_is_voting(node)); assert(raft_node_is_voting(node));
break; break;
......
...@@ -82,14 +82,6 @@ static int __raft_log_offer(raft_server_t* raft, ...@@ -82,14 +82,6 @@ static int __raft_log_offer(raft_server_t* raft,
raft_entry_t *entry, raft_entry_t *entry,
int entry_idx) 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; return 0;
} }
...@@ -3963,10 +3955,10 @@ void TestRaft_leader_recv_appendentries_response_set_has_sufficient_logs_after_v ...@@ -3963,10 +3955,10 @@ void TestRaft_leader_recv_appendentries_response_set_has_sufficient_logs_after_v
.type = RAFT_LOGTYPE_ADD_NONVOTING_NODE .type = RAFT_LOGTYPE_ADD_NONVOTING_NODE
}; };
msg_entry_response_t etyr; msg_entry_response_t etyr;
raft_recv_entry(r, &ety, &etyr); CuAssertIntEquals(tc, 0, raft_recv_entry(r, &ety, &etyr));
ety.id++; ety.id++;
ety.data.buf = "3"; ety.data.buf = "3";
raft_recv_entry(r, &ety, &etyr); CuAssertIntEquals(tc, 0, raft_recv_entry(r, &ety, &etyr));
msg_appendentries_response_t aer = { msg_appendentries_response_t aer = {
.term = 1, .success = 1, .current_idx = 2, .first_idx = 0 .term = 1, .success = 1, .current_idx = 2, .first_idx = 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment