Long living locks (#24)

ahydrax · Sep 21, 2021 · aec291d · aec291d
1 parent 351fa27
commit aec291d
Show file tree

Hide file tree

Showing 56 changed files with 1,511 additions and 1,776 deletions.
diff --git a/Hangfire.PostgreSql.sln.DotSettings b/Hangfire.PostgreSql.sln.DotSettings
@@ -6,5 +6,9 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=Constants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateConstants/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="_" Suffix="" Style="aaBb" /&gt;</s:String>
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Hangfire_002ECore_002ETests_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Hangfire_002EPostgreSql_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/Filtering/ExcludeCoverageFilters/=Hangfire_002ESqlServer_002ETests_003B_002A_003B_002A_003B_002A/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EdotCover_002EIde_002ECore_002EFilterManagement_002EModel_002ESolutionFilterSettingsManagerMigrateSettings/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="Hangfire.Core.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Hangfire.SqlServer.Tests" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="Hangfire.PostgreSql" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="False" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String></wpf:ResourceDictionary>
diff --git a/src/Hangfire.PostgreSql/Connectivity/ConnectionProviderExtensions.cs b/src/Hangfire.PostgreSql/Connectivity/ConnectionProviderExtensions.cs
@@ -14,15 +14,13 @@ public static int Execute(this IConnectionProvider connectionProvider,
             int? commandTimeout = null,
             CommandType? commandType = null)
         {
-            using (var connectionHolder = connectionProvider.AcquireConnection())
-            {
-                return connectionHolder.Connection.Execute(
-                    sql,
-                    param,
-                    transaction,
-                    commandTimeout,
-                    commandType);
-            }
+            using var connectionHolder = connectionProvider.AcquireConnection();
+            return connectionHolder.Connection.Execute(
+                sql,
+                param,
+                transaction,
+                commandTimeout,
+                commandType);
         }
 
         [CanBeNull]
@@ -33,15 +31,13 @@ public static T Fetch<T>(this IConnectionProvider connectionProvider,
             int? commandTimeout = null,
             CommandType? commandType = null)
         {
-            using (var connectionHolder = connectionProvider.AcquireConnection())
-            {
-                return connectionHolder.Fetch<T>(
-                    sql,
-                    param,
-                    transaction,
-                    commandTimeout,
-                    commandType);
-            }
+            using var connectionHolder = connectionProvider.AcquireConnection();
+            return connectionHolder.Fetch<T>(
+                sql,
+                param,
+                transaction,
+                commandTimeout,
+                commandType);
         }
 
         public static T FetchScalar<T>(this IConnectionProvider connectionProvider,
@@ -52,15 +48,13 @@ public static T FetchScalar<T>(this IConnectionProvider connectionProvider,
             CommandType? commandType = null)
             where T : struct
         {
-            using (var connectionHolder = connectionProvider.AcquireConnection())
-            {
-                return connectionHolder.FetchScalar<T>(
-                    sql,
-                    param,
-                    transaction,
-                    commandTimeout,
-                    commandType);
-            }
+            using var connectionHolder = connectionProvider.AcquireConnection();
+            return connectionHolder.FetchScalar<T>(
+                sql,
+                param,
+                transaction,
+                commandTimeout,
+                commandType);
         }
 
         [NotNull]
@@ -71,15 +65,13 @@ public static List<T> FetchList<T>(this IConnectionProvider connectionProvider,
             int? commandTimeout = null,
             CommandType? commandType = null)
         {
-            using (var connectionHolder = connectionProvider.AcquireConnection())
-            {
-                return connectionHolder.FetchList<T>(
-                    sql,
-                    param,
-                    transaction,
-                    commandTimeout,
-                    commandType);
-            }
+            using var connectionHolder = connectionProvider.AcquireConnection();
+            return connectionHolder.FetchList<T>(
+                sql,
+                param,
+                transaction,
+                commandTimeout,
+                commandType);
         }
     }
 }
diff --git a/src/Hangfire.PostgreSql/Connectivity/DefaultConnectionProvider.cs b/src/Hangfire.PostgreSql/Connectivity/DefaultConnectionProvider.cs
diff --git a/src/Hangfire.PostgreSql/Connectivity/NpgsqlConnectionProvider.cs b/src/Hangfire.PostgreSql/Connectivity/NpgsqlConnectionProvider.cs
@@ -1,4 +1,6 @@
 
+using Dapper;
+
 namespace Hangfire.PostgreSql.Connectivity
 {
     internal sealed class NpgsqlConnectionProvider : IConnectionProvider

diff --git a/src/Hangfire.PostgreSql/DatabaseInitializer.cs b/src/Hangfire.PostgreSql/DatabaseInitializer.cs
@@ -33,7 +33,7 @@ public void Initialize()
             using (var connectionHolder = _connectionProvider.AcquireConnection())
             {
                 var connection = connectionHolder.Connection;
-                var lockTaken = LockDatabase(connection);
+                var lockTaken = LockDatabase(connection, _schemaName);
                 if (!lockTaken) return;
 
                 TryCreateSchema(connection);
@@ -48,6 +48,7 @@ public void Initialize()
                     {
                         try
                         {
+                            connection.Execute($@"set search_path={_schemaName}");
                             connection.Execute(migration.Script, transaction: transaction);
                         }
                         catch (Exception e)
@@ -56,6 +57,7 @@ public void Initialize()
                             Log.ErrorException(errorMessage, e);
                             throw new ApplicationException(errorMessage, e);
                         }
+
                         lastMigration = migration;
                         Log.Info($"Installing Hangfire SQL migration #{migration.Version}");
                     }
@@ -68,22 +70,23 @@ public void Initialize()
                     transaction.Commit();
                 }
 
-                UnlockDatabase(connection);
+                UnlockDatabase(connection, _schemaName);
             }
 
             Log.Info("Hangfire SQL objects installed.");
         }
 
-        private static bool LockDatabase(NpgsqlConnection connection)
-            => connection.Query<bool>(@"select pg_try_advisory_lock(12345)").Single();
+        private bool LockDatabase(NpgsqlConnection connection, string lockId)
+            => connection.Query<bool>(@$"select pg_try_advisory_lock(hashtext('{lockId}'))").Single();
 
-        private static void UnlockDatabase(NpgsqlConnection connection)
-            => connection.Execute(@"select pg_advisory_unlock(12345)");
+        private void UnlockDatabase(NpgsqlConnection connection, string lockId)
+            => connection.Execute(@$"select pg_advisory_unlock(hashtext('{lockId}'))");
 
-        private static int GetInstalledVersion(NpgsqlConnection connection)
+        private int GetInstalledVersion(NpgsqlConnection connection)
         {
             try
             {
+                connection.Execute($@"set search_path={_schemaName}");
                 return connection.Query<int>(@"select version from schema").SingleOrDefault();
             }
             catch
@@ -94,16 +97,7 @@ private static int GetInstalledVersion(NpgsqlConnection connection)
 
         private void TryCreateSchema(NpgsqlConnection connection)
         {
-            try
-            {
-                connection.Execute($@"CREATE SCHEMA {_schemaName}");
-            }
-            catch
-            {
-                // Already created
-            }
-
-            connection.Execute($@"set search_path={_schemaName}");
+            connection.Execute($@"create schema if not exists {_schemaName}");
         }
 
         private static IEnumerable<MigrationInfo> GetMigrations()
@@ -134,7 +128,7 @@ private static Option<string> ReadStringResource(string resourceName)
             {
                 using (var stream = assembly.GetManifestResourceStream(resourceName))
                 {
-                    if (stream == null) return default(Option<string>);
+                    if (stream == null) return default;
 
                     using (var reader = new StreamReader(stream))
                     {
@@ -145,7 +139,7 @@ private static Option<string> ReadStringResource(string resourceName)
             }
             catch
             {
-                return default(Option<string>);
+                return default;
             }
         }
     }