ensure noResponse for slot verification of cluster commands

microsoft · Jan 17, 2025 · 74325aa · 74325aa
1 parent 7e31ae7
commit 74325aa
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 1 deletion.
diff --git a/libs/cluster/Session/ClusterSession.cs b/libs/cluster/Session/ClusterSession.cs
@@ -79,7 +79,7 @@ public void ProcessClusterCommands(RespCommand command, ref SessionParseState pa
                     {
                         csvi.keyNumOffset = -1;
                         clusterProvider.ExtractKeySpecs(commandInfo, command, ref parseState, ref csvi);
-                        if (NetworkMultiKeySlotVerify(ref parseState, ref csvi, ref this.dcurr, ref this.dend))
+                        if (NetworkMultiKeySlotVerifyNoResponse(ref parseState, ref csvi, ref this.dcurr, ref this.dend))
                             return;
                     }
 

diff --git a/libs/cluster/Session/SlotVerification/RespClusterSlotVerify.cs b/libs/cluster/Session/SlotVerification/RespClusterSlotVerify.cs
@@ -110,6 +110,14 @@ public bool NetworkKeyArraySlotVerify(Span<ArgSlice> keys, bool readOnly, byte s
             return true;
         }
 
+        /// <summary>
+        /// Verify multi-key slot ownership
+        /// </summary>
+        /// <param name="parseState"></param>
+        /// <param name="csvi"></param>
+        /// <param name="dcurr"></param>
+        /// <param name="dend"></param>
+        /// <returns></returns>
         public unsafe bool NetworkMultiKeySlotVerify(ref SessionParseState parseState, ref ClusterSlotVerificationInput csvi, ref byte* dcurr, ref byte* dend)
         {
             // If cluster is not enabled or a transaction is running skip slot check
@@ -124,5 +132,24 @@ public unsafe bool NetworkMultiKeySlotVerify(ref SessionParseState parseState, r
                 WriteClusterSlotVerificationMessage(config, vres, ref dcurr, ref dend);
             return true;
         }
+
+        /// <summary>
+        /// Verify multi-key slot ownership without generating a response
+        /// </summary>
+        /// <param name="parseState"></param>
+        /// <param name="csvi"></param>
+        /// <param name="dcurr"></param>
+        /// <param name="dend"></param>
+        /// <returns></returns>
+        public unsafe bool NetworkMultiKeySlotVerifyNoResponse(ref SessionParseState parseState, ref ClusterSlotVerificationInput csvi, ref byte* dcurr, ref byte* dend)
+        {
+            // If cluster is not enabled or a transaction is running skip slot check
+            if (!clusterProvider.serverOptions.EnableCluster || txnManager.state == TxnState.Running) return false;
+
+            var config = clusterProvider.clusterManager.CurrentConfig;
+            var vres = MultiKeySlotVerify(config, ref parseState, ref csvi);
+
+            return vres.state == SlotVerifiedState.OK ? false : true;
+        }
     }
 }
diff --git a/libs/server/Cluster/IClusterSession.cs b/libs/server/Cluster/IClusterSession.cs
@@ -88,6 +88,16 @@ public interface IClusterSession
         /// <returns></returns>
         unsafe bool NetworkMultiKeySlotVerify(ref SessionParseState parseState, ref ClusterSlotVerificationInput csvi, ref byte* dcurr, ref byte* dend);
 
+        /// <summary>
+        /// Array slot verify with no response
+        /// </summary>
+        /// <param name="parseState"></param>
+        /// <param name="csvi"></param>
+        /// <param name="dcurr"></param>
+        /// <param name="dend"></param>
+        /// <returns></returns>
+        unsafe bool NetworkMultiKeySlotVerifyNoResponse(ref SessionParseState parseState, ref ClusterSlotVerificationInput csvi, ref byte* dcurr, ref byte* dend);
+
         /// <summary>
         /// Sets the user currently authenticated in this session (used for permission checks)
         /// </summary>