Commit b1595c85 authored by Willem Thiart's avatar Willem Thiart
Browse files

Added next_idx increment on appendentries response

parent d855e95e
...@@ -180,9 +180,10 @@ int raft_recv_appendentries_response(raft_server_t* me_, ...@@ -180,9 +180,10 @@ int raft_recv_appendentries_response(raft_server_t* me_,
__log(me_, "received appendentries response from: %d success: %d", node, r->success); __log(me_, "received appendentries response from: %d success: %d", node, r->success);
raft_node_t* p = raft_get_node(me_, node);
if (0 == r->success) if (0 == r->success)
{ {
raft_node_t* p = raft_get_node(me_, node);
/* If AppendEntries fails because of log inconsistency: /* If AppendEntries fails because of log inconsistency:
decrement nextIndex and retry (§5.3) */ decrement nextIndex and retry (§5.3) */
assert(0 <= raft_node_get_next_idx(p)); assert(0 <= raft_node_get_next_idx(p));
...@@ -195,6 +196,8 @@ int raft_recv_appendentries_response(raft_server_t* me_, ...@@ -195,6 +196,8 @@ int raft_recv_appendentries_response(raft_server_t* me_,
return 0; return 0;
} }
raft_node_set_next_idx(p, r->current_idx + 1);
int i; int i;
for (i = r->first_idx; i <= r->current_idx; i++) for (i = r->first_idx; i <= r->current_idx; i++)
......
...@@ -1724,6 +1724,37 @@ TestRaft_leader_increase_commit_idx_when_majority_have_entry_and_atleast_one_new ...@@ -1724,6 +1724,37 @@ TestRaft_leader_increase_commit_idx_when_majority_have_entry_and_atleast_one_new
CuAssertTrue(tc, 2 == raft_get_last_applied_idx(r)); CuAssertTrue(tc, 2 == raft_get_last_applied_idx(r));
} }
void TestRaft_leader_recv_appendentries_response_increment_idx_of_peer(
CuTest * tc)
{
raft_cbs_t funcs = {
.send_appendentries = sender_appendentries,
.log = NULL
};
void *sender = sender_new(NULL);
void *r = raft_new();
raft_add_peer(r, (void*)1, 1);
raft_add_peer(r, (void*)2, 0);
raft_set_callbacks(r, &funcs, sender);
/* I'm the leader */
raft_set_state(r, RAFT_STATE_LEADER);
raft_set_current_term(r, 1);
raft_node_t* p = raft_get_node(r, 1);
CuAssertTrue(tc, 1 != raft_node_get_next_idx(p));
/* receive mock success responses */
msg_appendentries_response_t aer;
aer.term = 1;
aer.success = 1;
aer.current_idx = 1;
aer.first_idx = 1;
raft_recv_appendentries_response(r, 1, &aer);
CuAssertTrue(tc, 2 == raft_node_get_next_idx(p));
}
void TestRaft_leader_steps_down_if_received_appendentries_is_newer_than_itself( void TestRaft_leader_steps_down_if_received_appendentries_is_newer_than_itself(
CuTest * tc) CuTest * tc)
{ {
......
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