From 562aa151a7b1f8c1903637c90de1ab6aae5052ee Mon Sep 17 00:00:00 2001
From: Andy Dunstall <andydunstall@hotmail.co.uk>
Date: Sat, 3 Feb 2024 09:35:05 +0000
Subject: [PATCH] fix(zset): ignore cancelled op status in BZPopMinMax (#2527)

fix(zset): ignore cancelled op status
---
 src/server/zset_family.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/server/zset_family.cc b/src/server/zset_family.cc
index 62a495cfb..c07198b8f 100644
--- a/src/server/zset_family.cc
+++ b/src/server/zset_family.cc
@@ -1335,6 +1335,7 @@ void BZPopMinMax(CmdArgList args, ConnectionContext* cntx, bool is_max) {
   switch (popped_key.status()) {
     case OpStatus::WRONG_TYPE:
       return rb->SendError(kWrongTypeErr);
+    case OpStatus::CANCELLED:
     case OpStatus::TIMED_OUT:
       return rb->SendNullArray();
     default: