fixes error to acquire the lock

BrighterCommand · Nov 29, 2024 · 2a3151d · 2a3151d
1 parent 2de675b
commit 2a3151d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/Paramore.Brighter.Locking.MySql/MySqlLockingProvider.cs b/src/Paramore.Brighter.Locking.MySql/MySqlLockingProvider.cs
@@ -29,7 +29,7 @@ public class MySqlLockingProvider(MySqlConnectionProvider connectionProvider) :
     /// <returns>The id of the lock that has been acquired or null if no lock was able to be acquired</returns>
     public async Task<string> ObtainLockAsync(string resource, CancellationToken cancellationToken)
     {
-        if (!_connections.ContainsKey(resource))
+        if (_connections.ContainsKey(resource))
         {
             return null;
         }
@@ -44,9 +44,7 @@ public async Task<string> ObtainLockAsync(string resource, CancellationToken can
 
         command.Parameters.Add(new MySqlParameter("@TIMEOUT", MySqlDbType.UInt32)
         {
-            // Infinity timeout
-            // MariaDB doesn't support -1 value, see: https://stackoverflow.com/questions/49792089/set-infinite-timeout-get-lock-in-mariadb/49809919
-            Value = 0xffffffff
+            Value = 1 
         });
 
         var result = await command.ExecuteScalarAsync(cancellationToken) ?? -1;

diff --git a/src/Paramore.Brighter.Locking.MySql/MySqlLockingQueries.cs b/src/Paramore.Brighter.Locking.MySql/MySqlLockingQueries.cs
@@ -2,7 +2,7 @@
 
 public static class MySqlLockingQueries
 {
-    public const string ObtainLockQuery = "SELECT GET_LOCK(@RESOURCE_NAME)";
+    public const string ObtainLockQuery = "SELECT GET_LOCK(@RESOURCE_NAME, @TIMEOUT)";
 
-    public const string ReleaseLockQuery = "SELECT RELEASE_LOCK(@RESOURCE_NAME, @TIMEOUT)";
+    public const string ReleaseLockQuery = "SELECT RELEASE_LOCK(@RESOURCE_NAME)";
 }
diff --git a/...kingProvider/MsSqlLockingProviderTests.cs → ...kingProvider/MySqlLockingProviderTests.cs b/...kingProvider/MsSqlLockingProviderTests.cs → ...kingProvider/MySqlLockingProviderTests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Data;
 using System.Data.Common;
 using System.Threading;
 using System.Threading.Tasks;
@@ -11,22 +10,22 @@
 namespace Paramore.Brighter.MySQL.Tests.LockingProvider;
 
 [Trait("Category", "MySql")]
-public class MsSqlLockingProviderTests
+public class MySqlLockingProviderTests
 {
     private readonly MySqlTestHelper _msSqlTestHelper;
 
-    public MsSqlLockingProviderTests()
+    public MySqlLockingProviderTests()
     {
         _msSqlTestHelper = new MySqlTestHelper();
         _msSqlTestHelper.SetupMessageDb();
     }
 
 
     [Fact]
-    public async Task GivenAMsSqlLockingProvider_WhenLockIsCalled_LockCanBeObtainedAndThenReleased()
+    public async Task GivenAMySqlLockingProvider_WhenLockIsCalled_LockCanBeObtainedAndThenReleased()
     {
         var provider = new MySqlLockingProvider((MySqlConnectionProvider)_msSqlTestHelper.ConnectionProvider);
-        var resource = "Sweeper";
+        const string resource = "Sweeper";
 
         var result = await provider.ObtainLockAsync(resource, CancellationToken.None);
 
@@ -85,7 +84,7 @@ private async Task<DbConnection> ObtainLockForManualDisposal(string resource)
         command.Parameters.Add(new MySqlParameter("@RESOURCE_NAME", MySqlDbType.String));
         command.Parameters["@RESOURCE_NAME"].Value = resource;
         command.Parameters.Add(new MySqlParameter("@TIMEOUT", MySqlDbType.UInt32));
-        command.Parameters["@TIMEOUT"].Value = -1;
+        command.Parameters["@TIMEOUT"].Value = 1;
 
         var respone = await command.ExecuteScalarAsync(CancellationToken.None);