Fix for locks failing to extend in certain circumstances #97

samcook · Apr 4, 2022 · 0d5cdf3 · 0d5cdf3
1 parent 3898905
commit 0d5cdf3
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/RedLockNet.SERedis/RedLock.cs b/RedLockNet.SERedis/RedLock.cs
@@ -366,9 +366,9 @@ private void ExtendLockLifetime()
 			catch (OperationCanceledException)
 			{
 				// unlock has been called, don't extend
+				logger.LogDebug($"Lock renewal cancelled: {Resource} ({LockId})");
 			}
 		}
-
 
 		private long GetRemainingValidityTicks(Stopwatch sw)
 		{
@@ -414,8 +414,6 @@ private RedLockInstanceSummary Extend()
 
 		private void Unlock()
 		{
-			unlockCancellationTokenSource.Cancel();
-
 			// ReSharper disable once MethodSupportsCancellation
 			extendUnlockSemaphore.Wait();
 			try
@@ -430,8 +428,6 @@ private void Unlock()
 
 		private async Task UnlockAsync()
 		{
-			unlockCancellationTokenSource.Cancel();
-
 			// ReSharper disable once MethodSupportsCancellation
 			await extendUnlockSemaphore.WaitAsync().ConfigureAwait(false);
 			try
@@ -629,6 +625,7 @@ protected virtual void Dispose(bool disposing)
 				StopKeepAliveTimer();
 			}
 
+			unlockCancellationTokenSource.Cancel();
 			Unlock();
 
 			Status = RedLockStatus.Unlocked;
@@ -656,6 +653,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 				StopKeepAliveTimer();
 			}
 
+			unlockCancellationTokenSource.Cancel();
 			await UnlockAsync().ConfigureAwait(false);
 
 			Status = RedLockStatus.Unlocked;