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
5ea572f8
Commit
5ea572f8
authored
Apr 11, 2016
by
Willem Thiart
Browse files
Fix: append entries array index
Regression caused by
6f318d01
parent
6f318d01
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/raft_log.c
View file @
5ea572f8
...
@@ -109,7 +109,7 @@ int log_append_entry(log_t* me_, raft_entry_t* c)
...
@@ -109,7 +109,7 @@ int log_append_entry(log_t* me_, raft_entry_t* c)
if
(
me
->
cb
&&
me
->
cb
->
log_offer
)
if
(
me
->
cb
&&
me
->
cb
->
log_offer
)
{
{
void
*
ud
=
raft_get_udata
(
me
->
raft
);
void
*
ud
=
raft_get_udata
(
me
->
raft
);
e
=
me
->
cb
->
log_offer
(
me
->
raft
,
ud
,
c
,
me
->
back
-
1
);
e
=
me
->
cb
->
log_offer
(
me
->
raft
,
ud
,
c
,
me
->
back
);
if
(
e
==
RAFT_ERR_SHUTDOWN
)
if
(
e
==
RAFT_ERR_SHUTDOWN
)
return
e
;
return
e
;
}
}
...
...
tests/test_server.c
View file @
5ea572f8
...
@@ -192,6 +192,7 @@ static int __raft_logentry_offer(
...
@@ -192,6 +192,7 @@ static int __raft_logentry_offer(
int
ety_idx
int
ety_idx
)
)
{
{
CuAssertIntEquals
(
udata
,
ety_idx
,
0
);
ety
->
data
.
buf
=
udata
;
ety
->
data
.
buf
=
udata
;
return
0
;
return
0
;
}
}
...
@@ -202,10 +203,9 @@ void TestRaft_server_append_entry_user_can_set_data_buf(CuTest * tc)
...
@@ -202,10 +203,9 @@ void TestRaft_server_append_entry_user_can_set_data_buf(CuTest * tc)
.
log_offer
=
__raft_logentry_offer
,
.
log_offer
=
__raft_logentry_offer
,
};
};
char
*
data
=
"xxx"
;
void
*
r
=
raft_new
();
void
*
r
=
raft_new
();
raft_set_state
(
r
,
RAFT_STATE_CANDIDATE
);
raft_set_state
(
r
,
RAFT_STATE_CANDIDATE
);
raft_set_callbacks
(
r
,
&
funcs
,
data
);
raft_set_callbacks
(
r
,
&
funcs
,
tc
);
raft_set_current_term
(
r
,
5
);
raft_set_current_term
(
r
,
5
);
raft_entry_t
ety
=
{};
raft_entry_t
ety
=
{};
ety
.
term
=
1
;
ety
.
term
=
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