gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sentinel: fix info_refresh time before sentinel get first response (#8567)

Browse Source
This commit is contained in:
Wen Hui 2021-03-11 15:28:21 -05:00 committed by GitHub
parent a4f03bd7eb
commit 3c09ce26fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sentinel.c
View File

@ -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
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
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