Unverified Commit 32215e78 authored by Madelyn Olson's avatar Madelyn Olson Committed by GitHub
Browse files

Unpause clients earlier during manual cluster failover (#9676)

Unpause clients after manual failover ends instead of the timed offset
parent 45144fc7
...@@ -3536,8 +3536,10 @@ void clusterHandleSlaveMigration(int max_slaves) { ...@@ -3536,8 +3536,10 @@ void clusterHandleSlaveMigration(int max_slaves) {
* The function can be used both to initialize the manual failover state at * The function can be used both to initialize the manual failover state at
* startup or to abort a manual failover in progress. */ * startup or to abort a manual failover in progress. */
void resetManualFailover(void) { void resetManualFailover(void) {
if (server.cluster->mf_end) { if (server.cluster->mf_slave) {
checkClientPauseTimeoutAndReturnIfPaused(); /* We were a master failing over, so we paused clients. Regardless
* of the outcome we unpause now to allow traffic again. */
unpauseClients();
} }
server.cluster->mf_end = 0; /* No manual failover in progress. */ server.cluster->mf_end = 0; /* No manual failover in progress. */
server.cluster->mf_can_start = 0; server.cluster->mf_can_start = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment