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
84ba71b1
Commit
84ba71b1
authored
Jan 03, 2016
by
Willem Thiart
Browse files
Add raft_recv_voting_cfg_change_entry
parent
99760172
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/raft_private.h
View file @
84ba71b1
...
@@ -56,6 +56,8 @@ typedef struct {
...
@@ -56,6 +56,8 @@ typedef struct {
/* my node ID */
/* my node ID */
raft_node_t
*
node
;
raft_node_t
*
node
;
raft_node_t
*
node_with_voting_cfg_change
;
}
raft_server_private_t
;
}
raft_server_private_t
;
void
raft_election_start
(
raft_server_t
*
me
);
void
raft_election_start
(
raft_server_t
*
me
);
...
...
src/raft_server.c
View file @
84ba71b1
...
@@ -49,6 +49,7 @@ raft_server_t* raft_new()
...
@@ -49,6 +49,7 @@ raft_server_t* raft_new()
me
->
request_timeout
=
200
;
me
->
request_timeout
=
200
;
me
->
election_timeout
=
1000
;
me
->
election_timeout
=
1000
;
me
->
log
=
log_new
();
me
->
log
=
log_new
();
me
->
node_with_voting_cfg_change
=
NULL
;
raft_set_state
((
raft_server_t
*
)
me
,
RAFT_STATE_FOLLOWER
);
raft_set_state
((
raft_server_t
*
)
me
,
RAFT_STATE_FOLLOWER
);
me
->
current_leader
=
NULL
;
me
->
current_leader
=
NULL
;
return
(
raft_server_t
*
)
me
;
return
(
raft_server_t
*
)
me
;
...
@@ -734,7 +735,7 @@ void raft_apply_all(raft_server_t* me_)
...
@@ -734,7 +735,7 @@ void raft_apply_all(raft_server_t* me_)
int
raft_recv_voting_cfg_change_entry
(
raft_server_t
*
me_
,
int
raft_recv_voting_cfg_change_entry
(
raft_server_t
*
me_
,
raft_node_t
*
node
,
raft_node_t
*
node
,
msg_entry_t
*
e
,
msg_entry_t
*
e
ty
,
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_
;
...
@@ -742,7 +743,7 @@ int raft_recv_voting_cfg_change_entry(raft_server_t* me_,
...
@@ -742,7 +743,7 @@ int raft_recv_voting_cfg_change_entry(raft_server_t* me_,
if
(
me
->
node_with_voting_cfg_change
)
if
(
me
->
node_with_voting_cfg_change
)
return
-
1
;
return
-
1
;
int
e
=
raft_recv_entry
(
me_
,
e
,
r
);
int
e
=
raft_recv_entry
(
me_
,
e
ty
,
r
);
if
(
e
<
0
)
if
(
e
<
0
)
return
-
1
;
return
-
1
;
...
...
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