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
RedisLabs Raft
Commits
a50fa08e
Unverified
Commit
a50fa08e
authored
Sep 14, 2021
by
Ozan Tezcan
Committed by
GitHub
Sep 14, 2021
Browse files
Set leader_id while sending append entries (#56)
parent
73a3a856
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/raft_server.c
View file @
a50fa08e
...
@@ -1277,6 +1277,7 @@ int raft_send_appendentries(raft_server_t* me_, raft_node_t* node)
...
@@ -1277,6 +1277,7 @@ int raft_send_appendentries(raft_server_t* me_, raft_node_t* node)
msg_appendentries_t
ae
=
{
msg_appendentries_t
ae
=
{
.
term
=
me
->
current_term
,
.
term
=
me
->
current_term
,
.
leader_id
=
raft_get_nodeid
(
me_
),
.
leader_commit
=
raft_get_commit_idx
(
me_
),
.
leader_commit
=
raft_get_commit_idx
(
me_
),
.
msg_id
=
++
me
->
msg_id
,
.
msg_id
=
++
me
->
msg_id
,
};
};
...
...
tests/test_server.c
View file @
a50fa08e
...
@@ -4254,6 +4254,45 @@ void TestRaft_removed_node_starts_election(CuTest * tc)
...
@@ -4254,6 +4254,45 @@ void TestRaft_removed_node_starts_election(CuTest * tc)
raft_destroy
(
r
);
raft_destroy
(
r
);
}
}
int
cb_send_appendentries
(
raft_server_t
*
raft
,
void
*
udata
,
raft_node_t
*
node
,
msg_appendentries_t
*
msg
)
{
CuTest
*
tc
=
udata
;
CuAssertIntEquals
(
tc
,
raft_get_nodeid
(
raft
),
msg
->
leader_id
);
CuAssertIntEquals
(
tc
,
raft_get_msg_id
(
raft
),
msg
->
msg_id
);
CuAssertIntEquals
(
tc
,
raft_get_current_term
(
raft
),
msg
->
term
);
CuAssertIntEquals
(
tc
,
raft_get_commit_idx
(
raft
),
msg
->
leader_commit
);
CuAssertIntEquals
(
tc
,
1
,
msg
->
prev_log_idx
);
CuAssertIntEquals
(
tc
,
7
,
msg
->
prev_log_term
);
return
0
;
}
void
TestRaft_verify_append_entries_fields_are_set
(
CuTest
*
tc
)
{
raft_cbs_t
funcs
=
{
.
send_appendentries
=
cb_send_appendentries
,
};
void
*
r
=
raft_new
();
raft_set_callbacks
(
r
,
&
funcs
,
tc
);
raft_add_node
(
r
,
NULL
,
100
,
1
);
raft_add_node
(
r
,
NULL
,
2
,
0
);
raft_set_current_term
(
r
,
7
);
raft_entry_t
*
ety
=
__MAKE_ENTRY
(
1
,
7
,
"aaa"
);
raft_append_entry
(
r
,
ety
);
raft_append_entry
(
r
,
ety
);
raft_append_entry
(
r
,
ety
);
raft_append_entry
(
r
,
ety
);
raft_set_current_term
(
r
,
300
);
raft_set_commit_idx
(
r
,
4
);
raft_node_set_next_idx
(
raft_get_node
(
r
,
2
),
2
);
raft_send_appendentries_all
(
r
);
}
int
main
(
void
)
int
main
(
void
)
{
{
CuString
*
output
=
CuStringNew
();
CuString
*
output
=
CuStringNew
();
...
@@ -4388,6 +4427,7 @@ int main(void)
...
@@ -4388,6 +4427,7 @@ int main(void)
SUITE_ADD_TEST
(
suite
,
TestRaft_recv_appendreq_from_unknown_node
);
SUITE_ADD_TEST
(
suite
,
TestRaft_recv_appendreq_from_unknown_node
);
SUITE_ADD_TEST
(
suite
,
TestRaft_unknown_node_can_become_leader
);
SUITE_ADD_TEST
(
suite
,
TestRaft_unknown_node_can_become_leader
);
SUITE_ADD_TEST
(
suite
,
TestRaft_removed_node_starts_election
);
SUITE_ADD_TEST
(
suite
,
TestRaft_removed_node_starts_election
);
SUITE_ADD_TEST
(
suite
,
TestRaft_verify_append_entries_fields_are_set
);
CuSuiteRun
(
suite
);
CuSuiteRun
(
suite
);
CuSuiteDetails
(
suite
,
output
);
CuSuiteDetails
(
suite
,
output
);
...
...
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