Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
Willemt Raft
Commits
9f79cca3
Commit
9f79cca3
authored
Jan 25, 2016
by
Willem Thiart
Browse files
Refactorings
parent
795c5e9e
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/raft_node.c
View file @
9f79cca3
...
@@ -103,7 +103,6 @@ void raft_node_set_voting(raft_node_t* me_, int voting)
...
@@ -103,7 +103,6 @@ void raft_node_set_voting(raft_node_t* me_, int voting)
me
->
flags
|=
RAFT_NODE_VOTING
;
me
->
flags
|=
RAFT_NODE_VOTING
;
else
else
me
->
flags
&=
~
RAFT_NODE_VOTING
;
me
->
flags
&=
~
RAFT_NODE_VOTING
;
}
}
int
raft_node_is_voting
(
raft_node_t
*
me_
)
int
raft_node_is_voting
(
raft_node_t
*
me_
)
...
...
src/raft_server.c
View file @
9f79cca3
...
@@ -482,9 +482,10 @@ int raft_recv_requestvote_response(raft_server_t* me_,
...
@@ -482,9 +482,10 @@ int raft_recv_requestvote_response(raft_server_t* me_,
r
->
vote_granted
==
1
?
"granted"
:
"not granted"
);
r
->
vote_granted
==
1
?
"granted"
:
"not granted"
);
if
(
!
raft_is_candidate
(
me_
))
if
(
!
raft_is_candidate
(
me_
))
{
return
0
;
return
0
;
}
if
(
raft_get_current_term
(
me_
)
<
r
->
term
)
else
if
(
raft_get_current_term
(
me_
)
<
r
->
term
)
{
{
raft_set_current_term
(
me_
,
r
->
term
);
raft_set_current_term
(
me_
,
r
->
term
);
raft_become_follower
(
me_
);
raft_become_follower
(
me_
);
...
@@ -588,7 +589,9 @@ int raft_apply_entry(raft_server_t* me_)
...
@@ -588,7 +589,9 @@ int raft_apply_entry(raft_server_t* me_)
if
(
me
->
last_applied_idx
==
me
->
commit_idx
)
if
(
me
->
last_applied_idx
==
me
->
commit_idx
)
return
-
1
;
return
-
1
;
raft_entry_t
*
e
=
raft_get_entry_from_idx
(
me_
,
me
->
last_applied_idx
+
1
);
int
log_idx
=
me
->
last_applied_idx
+
1
;
raft_entry_t
*
e
=
raft_get_entry_from_idx
(
me_
,
log_idx
);
if
(
!
e
)
if
(
!
e
)
return
-
1
;
return
-
1
;
...
@@ -698,7 +701,6 @@ void raft_remove_node(raft_server_t* me_, raft_node_t* node)
...
@@ -698,7 +701,6 @@ void raft_remove_node(raft_server_t* me_, raft_node_t* node)
raft_server_private_t
*
me
=
(
raft_server_private_t
*
)
me_
;
raft_server_private_t
*
me
=
(
raft_server_private_t
*
)
me_
;
raft_node_t
*
new_array
,
*
new_node
;
raft_node_t
*
new_array
,
*
new_node
;
new_array
=
(
raft_node_t
*
)
calloc
((
me
->
num_nodes
-
1
),
sizeof
(
raft_node_t
*
));
new_array
=
(
raft_node_t
*
)
calloc
((
me
->
num_nodes
-
1
),
sizeof
(
raft_node_t
*
));
new_node
=
new_array
;
new_node
=
new_array
;
...
...
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