From be36d838dc24e7eaaeb4e35316c677a90b53b656 Mon Sep 17 00:00:00 2001 From: Oran Agra Date: Sat, 9 Jan 2021 20:22:20 +0200 Subject: [PATCH] CLIENT PAUSE - don't drop together with other blocked clients (#8302) When the server state changes and blocked clients are being dropped, the paused clients should not be dropped, they're safe to keep since unlike other blocked types, these commands are not half way though processing, and the commands they sent may get rejected according to the new server state. --- src/blocked.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/blocked.c b/src/blocked.c index 250e4bd98..46935c79f 100644 --- a/src/blocked.c +++ b/src/blocked.c @@ -214,6 +214,13 @@ void disconnectAllBlockedClients(void) { client *c = listNodeValue(ln); if (c->flags & CLIENT_BLOCKED) { + /* PAUSED clients are an exception, when they'll be unblocked, the + * command processing will start from scratch, and the command will + * be either executed or rejected. (unlike LIST blocked clients for + * which the command is already in progress in a way. */ + if (c->btype == BLOCKED_PAUSE) + continue; + addReplyError(c, "-UNBLOCKED force unblock from blocking operation, " "instance state changed (master -> replica?)");