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
d09abafe
Commit
d09abafe
authored
Dec 20, 2015
by
Willem Thiart
Browse files
Simplify raft_recv_entry
parent
65353d06
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/raft.h
View file @
d09abafe
...
@@ -435,7 +435,6 @@ int raft_recv_requestvote_response(raft_server_t* me,
...
@@ -435,7 +435,6 @@ int raft_recv_requestvote_response(raft_server_t* me,
* @param[out] r The resulting response
* @param[out] r The resulting response
* @return 0 on success, -1 on failure */
* @return 0 on success, -1 on failure */
int
raft_recv_entry
(
raft_server_t
*
me
,
int
raft_recv_entry
(
raft_server_t
*
me
,
raft_node_t
*
node
,
msg_entry_t
*
ety
,
msg_entry_t
*
ety
,
msg_entry_response_t
*
r
);
msg_entry_response_t
*
r
);
...
...
src/raft_server.c
View file @
d09abafe
...
@@ -513,7 +513,8 @@ int raft_recv_requestvote_response(raft_server_t* me_,
...
@@ -513,7 +513,8 @@ int raft_recv_requestvote_response(raft_server_t* me_,
return
0
;
return
0
;
}
}
int
raft_recv_entry
(
raft_server_t
*
me_
,
raft_node_t
*
node
,
msg_entry_t
*
e
,
int
raft_recv_entry
(
raft_server_t
*
me_
,
msg_entry_t
*
e
,
msg_entry_response_t
*
r
)
msg_entry_response_t
*
r
)
{
{
raft_server_private_t
*
me
=
(
raft_server_private_t
*
)
me_
;
raft_server_private_t
*
me
=
(
raft_server_private_t
*
)
me_
;
...
@@ -522,8 +523,8 @@ int raft_recv_entry(raft_server_t* me_, raft_node_t* node, msg_entry_t* e,
...
@@ -522,8 +523,8 @@ int raft_recv_entry(raft_server_t* me_, raft_node_t* node, msg_entry_t* e,
if
(
!
raft_is_leader
(
me_
))
if
(
!
raft_is_leader
(
me_
))
return
-
1
;
return
-
1
;
__log
(
me_
,
node
,
"received entry t:%d id: %d idx: %d"
,
__log
(
me_
,
NULL
,
"received entry t:%d id: %d idx: %d"
,
me
->
current_term
,
e
->
id
,
raft_get_current_idx
(
me_
)
+
1
,
node
);
me
->
current_term
,
e
->
id
,
raft_get_current_idx
(
me_
)
+
1
);
raft_entry_t
ety
;
raft_entry_t
ety
;
ety
.
term
=
me
->
current_term
;
ety
.
term
=
me
->
current_term
;
...
...
tests/mock_send_functions.c
View file @
d09abafe
...
@@ -177,7 +177,7 @@ void sender_poll_msgs(void* s)
...
@@ -177,7 +177,7 @@ void sender_poll_msgs(void* s)
case
RAFT_MSG_ENTRY
:
case
RAFT_MSG_ENTRY
:
{
{
msg_entry_response_t
response
;
msg_entry_response_t
response
;
raft_recv_entry
(
me
->
raft
,
m
->
sender
,
m
->
data
,
&
response
);
raft_recv_entry
(
me
->
raft
,
m
->
data
,
&
response
);
__append_msg
(
me
,
&
response
,
RAFT_MSG_ENTRY_RESPONSE
,
__append_msg
(
me
,
&
response
,
RAFT_MSG_ENTRY_RESPONSE
,
sizeof
(
response
),
m
->
sender
,
me
->
raft
);
sizeof
(
response
),
m
->
sender
,
me
->
raft
);
}
}
...
...
tests/test_server.c
View file @
d09abafe
...
@@ -355,7 +355,7 @@ void TestRaft_server_recv_entry_auto_commits_if_we_are_the_only_node(CuTest * tc
...
@@ -355,7 +355,7 @@ void TestRaft_server_recv_entry_auto_commits_if_we_are_the_only_node(CuTest * tc
/* receive entry */
/* receive entry */
msg_entry_response_t
cr
;
msg_entry_response_t
cr
;
raft_recv_entry
(
r
,
raft_get_node
(
r
,
1
),
&
ety
,
&
cr
);
raft_recv_entry
(
r
,
&
ety
,
&
cr
);
CuAssertTrue
(
tc
,
1
==
raft_get_log_count
(
r
));
CuAssertTrue
(
tc
,
1
==
raft_get_log_count
(
r
));
CuAssertTrue
(
tc
,
1
==
raft_get_commit_idx
(
r
));
CuAssertTrue
(
tc
,
1
==
raft_get_commit_idx
(
r
));
}
}
...
@@ -1534,7 +1534,7 @@ void TestRaft_leader_responds_to_entry_msg_when_entry_is_committed(CuTest * tc)
...
@@ -1534,7 +1534,7 @@ void TestRaft_leader_responds_to_entry_msg_when_entry_is_committed(CuTest * tc)
ety
.
data
.
len
=
strlen
(
"entry"
);
ety
.
data
.
len
=
strlen
(
"entry"
);
/* receive entry */
/* receive entry */
raft_recv_entry
(
r
,
raft_get_node
(
r
,
2
),
&
ety
,
&
cr
);
raft_recv_entry
(
r
,
&
ety
,
&
cr
);
CuAssertTrue
(
tc
,
1
==
raft_get_log_count
(
r
));
CuAssertTrue
(
tc
,
1
==
raft_get_log_count
(
r
));
/* trigger response through commit */
/* trigger response through commit */
...
@@ -1558,7 +1558,7 @@ void TestRaft_non_leader_recv_entry_msg_fails(CuTest * tc)
...
@@ -1558,7 +1558,7 @@ void TestRaft_non_leader_recv_entry_msg_fails(CuTest * tc)
ety
.
data
.
len
=
strlen
(
"entry"
);
ety
.
data
.
len
=
strlen
(
"entry"
);
/* receive entry */
/* receive entry */
int
e
=
raft_recv_entry
(
r
,
raft_get_node
(
r
,
2
),
&
ety
,
&
cr
);
int
e
=
raft_recv_entry
(
r
,
&
ety
,
&
cr
);
CuAssertTrue
(
tc
,
-
1
==
e
);
CuAssertTrue
(
tc
,
-
1
==
e
);
}
}
...
@@ -1758,7 +1758,7 @@ void TestRaft_leader_append_entry_to_log_increases_idxno(CuTest * tc)
...
@@ -1758,7 +1758,7 @@ void TestRaft_leader_append_entry_to_log_increases_idxno(CuTest * tc)
raft_set_state
(
r
,
RAFT_STATE_LEADER
);
raft_set_state
(
r
,
RAFT_STATE_LEADER
);
CuAssertTrue
(
tc
,
0
==
raft_get_log_count
(
r
));
CuAssertTrue
(
tc
,
0
==
raft_get_log_count
(
r
));
raft_recv_entry
(
r
,
raft_get_node
(
r
,
2
),
&
ety
,
&
cr
);
raft_recv_entry
(
r
,
&
ety
,
&
cr
);
CuAssertTrue
(
tc
,
1
==
raft_get_log_count
(
r
));
CuAssertTrue
(
tc
,
1
==
raft_get_log_count
(
r
));
}
}
...
@@ -2175,7 +2175,7 @@ void TestRaft_leader_recv_entry_resets_election_timeout(
...
@@ -2175,7 +2175,7 @@ void TestRaft_leader_recv_entry_resets_election_timeout(
/* receive entry */
/* receive entry */
msg_entry_response_t
cr
;
msg_entry_response_t
cr
;
raft_recv_entry
(
r
,
NULL
,
&
mety
,
&
cr
);
raft_recv_entry
(
r
,
&
mety
,
&
cr
);
CuAssertTrue
(
tc
,
0
==
raft_get_timeout_elapsed
(
r
));
CuAssertTrue
(
tc
,
0
==
raft_get_timeout_elapsed
(
r
));
}
}
...
@@ -2197,7 +2197,7 @@ void TestRaft_leader_recv_entry_is_committed_returns_0_if_not_committed(CuTest *
...
@@ -2197,7 +2197,7 @@ void TestRaft_leader_recv_entry_is_committed_returns_0_if_not_committed(CuTest *
/* receive entry */
/* receive entry */
msg_entry_response_t
cr
;
msg_entry_response_t
cr
;
raft_recv_entry
(
r
,
raft_get_node
(
r
,
2
),
&
mety
,
&
cr
);
raft_recv_entry
(
r
,
&
mety
,
&
cr
);
CuAssertTrue
(
tc
,
0
==
raft_msg_entry_response_committed
(
r
,
&
cr
));
CuAssertTrue
(
tc
,
0
==
raft_msg_entry_response_committed
(
r
,
&
cr
));
raft_set_commit_idx
(
r
,
1
);
raft_set_commit_idx
(
r
,
1
);
...
@@ -2222,7 +2222,7 @@ void TestRaft_leader_recv_entry_is_committed_returns_neg_1_if_invalidated(CuTest
...
@@ -2222,7 +2222,7 @@ void TestRaft_leader_recv_entry_is_committed_returns_neg_1_if_invalidated(CuTest
/* receive entry */
/* receive entry */
msg_entry_response_t
cr
;
msg_entry_response_t
cr
;
raft_recv_entry
(
r
,
raft_get_node
(
r
,
2
),
&
mety
,
&
cr
);
raft_recv_entry
(
r
,
&
mety
,
&
cr
);
CuAssertTrue
(
tc
,
0
==
raft_msg_entry_response_committed
(
r
,
&
cr
));
CuAssertTrue
(
tc
,
0
==
raft_msg_entry_response_committed
(
r
,
&
cr
));
CuAssertTrue
(
tc
,
cr
.
term
==
1
);
CuAssertTrue
(
tc
,
cr
.
term
==
1
);
CuAssertTrue
(
tc
,
cr
.
idx
==
1
);
CuAssertTrue
(
tc
,
cr
.
idx
==
1
);
...
@@ -2288,7 +2288,7 @@ void TestRaft_leader_recv_entry_does_not_send_new_appendentries_to_slow_nodes(Cu
...
@@ -2288,7 +2288,7 @@ void TestRaft_leader_recv_entry_does_not_send_new_appendentries_to_slow_nodes(Cu
/* receive entry */
/* receive entry */
msg_entry_response_t
cr
;
msg_entry_response_t
cr
;
raft_recv_entry
(
r
,
NULL
,
&
mety
,
&
cr
);
raft_recv_entry
(
r
,
&
mety
,
&
cr
);
/* check if the slow node got sent this appendentries */
/* check if the slow node got sent this appendentries */
msg_appendentries_t
*
ae
;
msg_appendentries_t
*
ae
;
...
...
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