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
3e5b1a6f
Commit
3e5b1a6f
authored
Aug 04, 2015
by
Willem Thiart
Browse files
Fixed ae.prev_log_idx
parent
c0103668
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/raft_server.c
View file @
3e5b1a6f
...
...
@@ -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
);
if
(
ety
)
{
ae
.
prev_log_idx
=
ety
->
id
;
ae
.
prev_log_idx
=
next_idx
-
1
;
ae
.
prev_log_term
=
ety
->
term
;
if
(
me
->
commit_idx
<
next_idx
)
...
...
tests/test_server.c
View file @
3e5b1a6f
...
...
@@ -1483,6 +1483,53 @@ void TestRaft_leader_sends_appendentries_with_leader_commit(
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 */
void
TestRaft_leader_retries_appendentries_with_decremented_NextIdx_log_inconsistency(
...
...
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