Server side transaction failure in Cluster Mode (microsoft#702)

* Removing IClusterSession as it can be fetched through respserver session. It's not set and results in object reference null exception for cluster mode transactions * Version bumped. --------- Co-authored-by: Badrish Chandramouli <[email protected]>
yrajas · Oct 4, 2024 · 28328d0 · 28328d0
1 parent 748ec9a
commit 28328d0
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 7 deletions.
diff --git a/.azure/pipelines/azure-pipelines-external-release.yml b/.azure/pipelines/azure-pipelines-external-release.yml
@@ -3,7 +3,7 @@
 #      1) update the name: string below (line 6)     -- this is the version for the nuget package (e.g. 1.0.0)
 #      2) update \libs\host\GarnetServer.cs readonly string version  (~line 53)   -- NOTE - these two values need to be the same 
 ###################################### 
-name: 1.0.29
+name: 1.0.30
 trigger:
   branches:
     include:

diff --git a/libs/host/GarnetServer.cs b/libs/host/GarnetServer.cs
@@ -52,7 +52,7 @@ public class GarnetServer : IDisposable
         protected StoreWrapper storeWrapper;
 
         // IMPORTANT: Keep the version in sync with .azure\pipelines\azure-pipelines-external-release.yml line ~6.
-        readonly string version = "1.0.29";
+        readonly string version = "1.0.30";
 
         /// <summary>
         /// Resp protocol version

diff --git a/libs/server/Transaction/TransactionManager.cs b/libs/server/Transaction/TransactionManager.cs
@@ -57,9 +57,6 @@ public sealed unsafe partial class TransactionManager
         // Not readonly to avoid defensive copy
         GarnetWatchApi<BasicGarnetApi> garnetTxPrepareApi;
 
-        // Cluster session
-        IClusterSession clusterSession;
-
         // Not readonly to avoid defensive copy
         LockableGarnetApi garnetTxMainApi;
 
@@ -118,7 +115,6 @@ internal TransactionManager(
             this.logger = logger;
 
             this.respSession = respSession;
-            this.clusterSession = respSession.clusterSession;
 
             watchContainer = new WatchedKeysContainer(initialSliceBufferSize, functionsState.watchVersionMap);
             keyEntries = new TxnKeyEntries(initialSliceBufferSize, lockableContext, objectStoreLockableContext);

diff --git a/libs/server/Transaction/TxnKeyManager.cs b/libs/server/Transaction/TxnKeyManager.cs
@@ -31,7 +31,7 @@ public unsafe void VerifyKeyOwnership(ArgSlice key, LockType type)
             if (!clusterEnabled) return;
 
             bool readOnly = type == LockType.Shared;
-            if (!clusterSession.CheckSingleKeySlotVerify(key, readOnly, respSession.SessionAsking))
+            if (!respSession.clusterSession.CheckSingleKeySlotVerify(key, readOnly, respSession.SessionAsking))
             {
                 this.state = TxnState.Aborted;
                 return;