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
redis
Commits
7bac7d37
Commit
7bac7d37
authored
Sep 07, 2015
by
antirez
Browse files
Fix merge issues in
490847c6
.
parent
9155cdc3
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/rdb.c
View file @
7bac7d37
...
@@ -1510,12 +1510,12 @@ int rdbSaveToSlavesSockets(void) {
...
@@ -1510,12 +1510,12 @@ int rdbSaveToSlavesSockets(void) {
* replicationSetupSlaveForFullResync() turned it into BGSAVE_END */
* replicationSetupSlaveForFullResync() turned it into BGSAVE_END */
listRewind
(
server
.
slaves
,
&
li
);
listRewind
(
server
.
slaves
,
&
li
);
while
((
ln
=
listNext
(
&
li
)))
{
while
((
ln
=
listNext
(
&
li
)))
{
c
lient
*
slave
=
ln
->
value
;
redisC
lient
*
slave
=
ln
->
value
;
int
j
;
int
j
;
for
(
j
=
0
;
j
<
numfds
;
j
++
)
{
for
(
j
=
0
;
j
<
numfds
;
j
++
)
{
if
(
slave
->
id
==
clientids
[
j
])
{
if
(
slave
->
id
==
clientids
[
j
])
{
slave
->
replstate
=
SLAVE_STATE
_WAIT_BGSAVE_START
;
slave
->
replstate
=
REDIS_REPL
_WAIT_BGSAVE_START
;
break
;
break
;
}
}
}
}
...
...
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