Don't share the same semaphore by multiple storage instances

HangfireIO · Oct 13, 2020 · 2eabb17 · 2eabb17
1 parent 7319063
commit 2eabb17
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/Hangfire.SqlServer/SqlServerJobQueue.cs b/src/Hangfire.SqlServer/SqlServerJobQueue.cs
@@ -40,7 +40,8 @@ internal class SqlServerJobQueue : IPersistentJobQueue
         private static readonly TimeSpan LongPollingThreshold = TimeSpan.FromSeconds(1);
         private static readonly int PollingQuantumMs = 1000;
         private static readonly int MinPollingDelayMs = 50;
-        private static readonly ConcurrentDictionary<string, SemaphoreSlim> Semaphores = new ConcurrentDictionary<string, SemaphoreSlim>();
+        private static readonly ConcurrentDictionary<Tuple<SqlServerStorage, string>, SemaphoreSlim> Semaphores =
+            new ConcurrentDictionary<Tuple<SqlServerStorage, string>, SemaphoreSlim>();
 
         private readonly SqlServerStorage _storage;
         private readonly SqlServerStorageOptions _options;
@@ -93,7 +94,7 @@ private SqlServerTimeoutJob DequeueUsingSlidingInvisibilityTimeout(string[] queu
 
             var useLongPolling = false;
             var queuesString = String.Join("_", queues.OrderBy(x => x));
-            var semaphore = Semaphores.GetOrAdd(queuesString, new SemaphoreSlim(initialCount: 1));
+            var semaphore = Semaphores.GetOrAdd(Tuple.Create(_storage, queuesString), new SemaphoreSlim(initialCount: 1));
 
             var pollingDelayMs = Math.Min(
                 Math.Max((int)_options.QueuePollInterval.TotalMilliseconds, MinPollingDelayMs),