Commit 3e5b1a6f authored by Willem Thiart's avatar Willem Thiart
Browse files

Fixed ae.prev_log_idx

parent c0103668
...@@ -505,7 +505,7 @@ void raft_send_appendentries(raft_server_t* me_, int node) ...@@ -505,7 +505,7 @@ void raft_send_appendentries(raft_server_t* me_, int node)
raft_entry_t* ety = raft_get_entry_from_idx(me_, next_idx - 1); raft_entry_t* ety = raft_get_entry_from_idx(me_, next_idx - 1);
if (ety) if (ety)
{ {
ae.prev_log_idx = ety->id; ae.prev_log_idx = next_idx - 1;
ae.prev_log_term = ety->term; ae.prev_log_term = ety->term;
if (me->commit_idx < next_idx) if (me->commit_idx < next_idx)
......
...@@ -1483,6 +1483,53 @@ void TestRaft_leader_sends_appendentries_with_leader_commit( ...@@ -1483,6 +1483,53 @@ void TestRaft_leader_sends_appendentries_with_leader_commit(
CuAssertTrue(tc, ae->leader_commit == 10); CuAssertTrue(tc, ae->leader_commit == 10);
} }
void TestRaft_leader_sends_appendentries_with_prevLogIdx(
CuTest * tc)
{
raft_cbs_t funcs = {
.send_appendentries = sender_appendentries,
.log = NULL
};
void *sender = sender_new(NULL);
void *r = raft_new();
raft_set_callbacks(r, &funcs, sender);
raft_add_peer(r, (void*)1, 1);
raft_add_peer(r, (void*)2, 0);
/* i'm leader */
raft_set_state(r, RAFT_STATE_LEADER);
raft_set_commit_idx(r, 10);
/* receive appendentries messages */
raft_send_appendentries(r, 0);
msg_appendentries_t* ae = sender_poll_msg_data(sender);
CuAssertTrue(tc, NULL != ae);
CuAssertTrue(tc, ae->prev_log_idx == 0);
/* add an entry */
/* receive appendentries messages */
raft_entry_t ety;
ety.term = 1;
ety.id = 100;
ety.len = 4;
ety.data = (unsigned char*)"aaa";
raft_append_entry(r, &ety);
raft_send_appendentries(r, 0);
ae = sender_poll_msg_data(sender);
CuAssertTrue(tc, NULL != ae);
CuAssertTrue(tc, ae->prev_log_idx == 0);
/* set next_idx */
/* receive appendentries messages */
raft_node_t* n = raft_get_node(r, 0);
raft_node_set_next_idx(n, 2);
raft_send_appendentries(r, 0);
ae = sender_poll_msg_data(sender);
CuAssertTrue(tc, NULL != ae);
CuAssertTrue(tc, ae->prev_log_idx == 1);
}
/* 5.3 */ /* 5.3 */
void void
TestRaft_leader_retries_appendentries_with_decremented_NextIdx_log_inconsistency( TestRaft_leader_retries_appendentries_with_decremented_NextIdx_log_inconsistency(
......
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