RavenDB-20968 deference shard & orchestrator executors

karmeli87 · Jul 31, 2023 · 263d7a4 · 263d7a4
1 parent d251053
commit 263d7a4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/Raven.Server/Documents/Sharding/Executors/AbstractExecutor.cs b/src/Raven.Server/Documents/Sharding/Executors/AbstractExecutor.cs
@@ -33,6 +33,12 @@ protected AbstractExecutor([NotNull] ServerStore store)
         ServerStore.Server.ServerCertificateChanged += OnCertificateChange;
     }
 
+    public void ForgetAbout()
+    {
+        // the event handler holds a strong reference to this object, so it will not be collected by the gc
+        ServerStore.Server.ServerCertificateChanged -= OnCertificateChange;
+    }
+
     public abstract RequestExecutor GetRequestExecutorAt(int position);
 
     protected abstract Memory<int> GetAllPositions();

diff --git a/src/Raven.Server/Documents/Sharding/ShardedDatabaseContext.cs b/src/Raven.Server/Documents/Sharding/ShardedDatabaseContext.cs
@@ -120,6 +120,7 @@ private void OnDatabaseRecordChange(DatabaseRecord record, long index)
 
             if (DictionaryExtensions.KeysEqual(record.Sharding.Shards, _record.Sharding.Shards) == false)
             {
+                ShardExecutor.ForgetAbout();
                 ShardExecutor = new ShardExecutor(ServerStore, record, record.DatabaseName);
             }
             else
@@ -139,6 +140,7 @@ private void OnDatabaseRecordChange(DatabaseRecord record, long index)
 
             if (CheckForTopologyChangesAndRaiseNotification(record.Sharding.Orchestrator.Topology, _record.Sharding.Orchestrator.Topology))
             {
+                AllOrchestratorNodesExecutor.ForgetAbout();
                 AllOrchestratorNodesExecutor = new AllOrchestratorNodesExecutor(ServerStore, record);
             }
 
@@ -171,8 +173,10 @@ private void OnUrlChange(DatabaseRecord record, long index)
             // we explicitly do not dispose the old executors here to avoid possible memory invalidation and since this is expected to be rare.
             // So we rely on the GC to dispose them via the finalizer
 
+            ShardExecutor.ForgetAbout();
             ShardExecutor = new ShardExecutor(ServerStore, _record, _record.DatabaseName);
 
+            AllOrchestratorNodesExecutor.ForgetAbout();
             AllOrchestratorNodesExecutor = new AllOrchestratorNodesExecutor(ServerStore, _record);
         }