Skip to content

Sentinel: Skip IS-PRIMARY-DOWN-BY-ADDR requests when primary not SDOWN #2633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
Open

Sentinel: Skip IS-PRIMARY-DOWN-BY-ADDR requests when primary not SDOWN #2633

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c02442
sentinel: skip IS-PRIMARY-DOWN-BY-ADDR requests when primary not sdown
zhijun42 Sep 20, 2025
7f25d71
Add a comment
zhijun42 Sep 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/sentinel.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4543,15 +4543,19 @@ void sentinelReceiveIsPrimaryDownReply(valkeyAsyncContext *c, void *reply, void
* in order to get the replies that allow to reach the quorum
* needed to mark the primary in ODOWN state and trigger a failover. */
void sentinelAskPrimaryStateToOtherSentinels(sentinelValkeyInstance *primary, int flags) {
/* We don't need to send requests when the primary is not SDOWN */
if ((primary->flags & SRI_S_DOWN) == 0) return;

char port[32];
ll2string(port, sizeof(port), primary->addr->port);

dictIterator *di;
dictEntry *de;

di = dictGetIterator(primary->sentinels);
while ((de = dictNext(di)) != NULL) {
sentinelValkeyInstance *ri = dictGetVal(de);
mstime_t elapsed = mstime() - ri->last_primary_down_reply_time;
char port[32];
int retval;

/* If the primary state from other sentinel is too old, we clear it. */
if (elapsed > sentinel_ask_period * 5) {
Expand All @@ -4565,14 +4569,12 @@ void sentinelAskPrimaryStateToOtherSentinels(sentinelValkeyInstance *primary, in
* 1) We believe it is down, or there is a failover in progress.
* 2) Sentinel is connected.
* 3) We did not receive the info within SENTINEL_ASK_PERIOD ms. */
if ((primary->flags & SRI_S_DOWN) == 0) continue;
if (ri->link->disconnected) continue;
if (!(flags & SENTINEL_ASK_FORCED) && mstime() - ri->last_primary_down_reply_time < sentinel_ask_period)
continue;

/* Ask */
ll2string(port, sizeof(port), primary->addr->port);
retval = valkeyAsyncCommand(
int retval = valkeyAsyncCommand(
ri->link->cc, sentinelReceiveIsPrimaryDownReply, ri, "%s is-master-down-by-addr %s %s %llu %s",
sentinelInstanceMapCommand(ri, "SENTINEL"), announceSentinelAddr(primary->addr), port,
sentinel.current_epoch, (primary->failover_state > SENTINEL_FAILOVER_STATE_NONE) ? sentinel.myid : "*");
Expand Down
Loading