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
3c09ce26
Unverified
Commit
3c09ce26
authored
Mar 11, 2021
by
Wen Hui
Committed by
GitHub
Mar 11, 2021
Browse files
Sentinel: fix info_refresh time before sentinel get first response (#8567)
parent
a4f03bd7
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/sentinel.c
View file @
3c09ce26
...
@@ -3344,7 +3344,8 @@ void addReplySentinelRedisInstance(client *c, sentinelRedisInstance *ri) {
...
@@ -3344,7 +3344,8 @@ void addReplySentinelRedisInstance(client *c, sentinelRedisInstance *ri) {
/* Masters and Slaves */
/* Masters and Slaves */
if
(
ri
->
flags
&
(
SRI_MASTER
|
SRI_SLAVE
))
{
if
(
ri
->
flags
&
(
SRI_MASTER
|
SRI_SLAVE
))
{
addReplyBulkCString
(
c
,
"info-refresh"
);
addReplyBulkCString
(
c
,
"info-refresh"
);
addReplyBulkLongLong
(
c
,
mstime
()
-
ri
->
info_refresh
);
addReplyBulkLongLong
(
c
,
ri
->
info_refresh
?
(
mstime
()
-
ri
->
info_refresh
)
:
0
);
fields
++
;
fields
++
;
addReplyBulkCString
(
c
,
"role-reported"
);
addReplyBulkCString
(
c
,
"role-reported"
);
...
@@ -3811,7 +3812,8 @@ NULL
...
@@ -3811,7 +3812,8 @@ NULL
addReplyBulkCBuffer
(
c
,
ri
->
name
,
strlen
(
ri
->
name
));
addReplyBulkCBuffer
(
c
,
ri
->
name
,
strlen
(
ri
->
name
));
addReplyArrayLen
(
c
,
dictSize
(
ri
->
slaves
)
+
1
);
/* +1 for self */
addReplyArrayLen
(
c
,
dictSize
(
ri
->
slaves
)
+
1
);
/* +1 for self */
addReplyArrayLen
(
c
,
2
);
addReplyArrayLen
(
c
,
2
);
addReplyLongLong
(
c
,
now
-
ri
->
info_refresh
);
addReplyLongLong
(
c
,
ri
->
info_refresh
?
(
now
-
ri
->
info_refresh
)
:
0
);
if
(
ri
->
info
)
if
(
ri
->
info
)
addReplyBulkCBuffer
(
c
,
ri
->
info
,
sdslen
(
ri
->
info
));
addReplyBulkCBuffer
(
c
,
ri
->
info
,
sdslen
(
ri
->
info
));
else
else
...
@@ -3823,7 +3825,8 @@ NULL
...
@@ -3823,7 +3825,8 @@ NULL
while
((
sde
=
dictNext
(
sdi
))
!=
NULL
)
{
while
((
sde
=
dictNext
(
sdi
))
!=
NULL
)
{
sentinelRedisInstance
*
sri
=
dictGetVal
(
sde
);
sentinelRedisInstance
*
sri
=
dictGetVal
(
sde
);
addReplyArrayLen
(
c
,
2
);
addReplyArrayLen
(
c
,
2
);
addReplyLongLong
(
c
,
now
-
sri
->
info_refresh
);
addReplyLongLong
(
c
,
ri
->
info_refresh
?
(
now
-
sri
->
info_refresh
)
:
0
);
if
(
sri
->
info
)
if
(
sri
->
info
)
addReplyBulkCBuffer
(
c
,
sri
->
info
,
sdslen
(
sri
->
info
));
addReplyBulkCBuffer
(
c
,
sri
->
info
,
sdslen
(
sri
->
info
));
else
else
...
...
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