From e4d183afd33e0b2e6e8d1c79a832f678a04a7886 Mon Sep 17 00:00:00 2001 From: Binbin Date: Thu, 8 Jun 2023 20:13:53 +0800 Subject: [PATCH] Add missing return on -UNKILLABLE sent by master case (#12277) We now no longer propagate scripts (started from 7.0), so this is a very rare issue that in nearly-dead-code. This is an overlook in #9780 --- src/script.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/script.c b/src/script.c index 70680e3ea..6a798a6e1 100644 --- a/src/script.c +++ b/src/script.c @@ -292,6 +292,7 @@ void scriptKill(client *c, int is_eval) { if (mustObeyClient(curr_run_ctx->original_client)) { addReplyError(c, "-UNKILLABLE The busy script was sent by a master instance in the context of replication and cannot be killed."); + return; } if (curr_run_ctx->flags & SCRIPT_WRITE_DIRTY) { addReplyError(c,