Commit eb64a97d authored by Binbin's avatar Binbin Committed by Oran Agra
Browse files

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

(cherry picked from commit e4d183af)
parent 2ba8de9d
......@@ -299,6 +299,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,
......
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