Commit f53a72e3 authored by Willem's avatar Willem
Browse files

Merge pull request #8 from pmembrey/master

Candidate ID was not being set when calling RequestVote callbacks
parents 5adcd8ba 993cd3a3
...@@ -426,6 +426,7 @@ int raft_send_requestvote(raft_server_t* me_, int node) ...@@ -426,6 +426,7 @@ int raft_send_requestvote(raft_server_t* me_, int node)
rv.term = me->current_term; rv.term = me->current_term;
rv.last_log_idx = raft_get_current_idx(me_); rv.last_log_idx = raft_get_current_idx(me_);
rv.last_log_term = raft_get_current_term(me_); rv.last_log_term = raft_get_current_term(me_);
rv.candidate_id = raft_get_nodeid(me_);
if (me->cb.send_requestvote) if (me->cb.send_requestvote)
me->cb.send_requestvote(me_, me->udata, node, &rv); me->cb.send_requestvote(me_, me->udata, node, &rv);
return 0; return 0;
......
...@@ -1283,7 +1283,7 @@ void TestRaft_candidate_requestvote_includes_logidx(CuTest * tc) ...@@ -1283,7 +1283,7 @@ void TestRaft_candidate_requestvote_includes_logidx(CuTest * tc)
sender = sender_new(NULL); sender = sender_new(NULL);
r = raft_new(); r = raft_new();
raft_set_configuration(r, cfg, 0); raft_set_configuration(r, cfg, 99);
raft_set_state(r, RAFT_STATE_CANDIDATE); raft_set_state(r, RAFT_STATE_CANDIDATE);
raft_set_callbacks(r, &funcs, sender); raft_set_callbacks(r, &funcs, sender);
...@@ -1296,6 +1296,7 @@ void TestRaft_candidate_requestvote_includes_logidx(CuTest * tc) ...@@ -1296,6 +1296,7 @@ void TestRaft_candidate_requestvote_includes_logidx(CuTest * tc)
CuAssertTrue(tc, 3 == rv->last_log_idx); CuAssertTrue(tc, 3 == rv->last_log_idx);
CuAssertTrue(tc, 5 == rv->term); CuAssertTrue(tc, 5 == rv->term);
CuAssertTrue(tc, 5 == rv->last_log_term); CuAssertTrue(tc, 5 == rv->last_log_term);
CuAssertTrue(tc, 99 == rv->candidate_id);
} }
/* Candidate 5.2 */ /* Candidate 5.2 */
......
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