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
9e40c46f
Commit
9e40c46f
authored
Nov 13, 2013
by
antirez
Browse files
Sentinel: fix no-down check in master->slave conversion code.
parent
ae35b7e2
Changes
1
Show whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
9e40c46f
...
@@ -1574,7 +1574,7 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
...
@@ -1574,7 +1574,7 @@ void sentinelRefreshInstanceInfo(sentinelRedisInstance *ri, const char *info) {
* configuratio via Pub/Sub if any. */
* configuratio via Pub/Sub if any. */
mstime_t
wait_time
=
SENTINEL_PUBLISH_PERIOD
*
4
;
mstime_t
wait_time
=
SENTINEL_PUBLISH_PERIOD
*
4
;
if
(
!
sentinelRedisInstanceNoDownFor
(
ri
->
master
,
wait_time
)
||
if
(
!
sentinelRedisInstanceNoDownFor
(
ri
,
wait_time
)
||
(
mstime
()
-
sentinel
.
tilt_start_time
)
<
wait_time
)
(
mstime
()
-
sentinel
.
tilt_start_time
)
<
wait_time
)
return
;
return
;
...
...
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