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
redis
Commits
78ac9b7f
Commit
78ac9b7f
authored
Nov 11, 2014
by
antirez
Browse files
Disconnect timedout slave: regression introduced with diskless repl.
parent
75e68625
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/replication.c
View file @
78ac9b7f
...
@@ -2003,8 +2003,9 @@ void replicationCron(void) {
...
@@ -2003,8 +2003,9 @@ void replicationCron(void) {
if
(
slave
->
flags
&
REDIS_PRE_PSYNC
)
continue
;
if
(
slave
->
flags
&
REDIS_PRE_PSYNC
)
continue
;
if
((
server
.
unixtime
-
slave
->
repl_ack_time
)
>
server
.
repl_timeout
)
if
((
server
.
unixtime
-
slave
->
repl_ack_time
)
>
server
.
repl_timeout
)
{
{
redisLog
(
REDIS_WARNING
,
"Disconnecting timedout slave: %s"
,
redisLog
(
REDIS_WARNING
,
"Disconnecting timedout slave: %s"
,
replicationGetSlaveName
(
slave
));
replicationGetSlaveName
(
slave
));
freeClient
(
slave
);
}
}
}
}
}
}
...
...
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