Database Migrator: Make database command timeout configurable (#626)

* feat: make CommandTimeout configurable in modules * feat: make CommandTimeout configurable in DatabaseMigrator * chore: fix warning
nmshd · Apr 26, 2024 · d7911f9 · d7911f9
1 parent d41de55
commit d7911f9
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 18 deletions.
diff --git a/AdminApi/src/AdminApi.Infrastructure/Persistence/IServiceCollectionExtension.cs b/AdminApi/src/AdminApi.Infrastructure/Persistence/IServiceCollectionExtension.cs
@@ -36,7 +36,7 @@ public static IServiceCollection AddDatabase(this IServiceCollection services, A
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.ConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "AdminUi");
@@ -45,7 +45,7 @@ public static IServiceCollection AddDatabase(this IServiceCollection services, A
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.ConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "AdminUi");
@@ -63,6 +63,7 @@ public class DbOptions
     {
         public string Provider { get; set; } = null!;
         public string ConnectionString { get; set; } = null!;
+        public int CommandTimeout { get; set; } = 20;
         public RetryOptions RetryOptions { get; set; } = new();
     }
 

diff --git a/DatabaseMigrator/Configuration.cs b/DatabaseMigrator/Configuration.cs
@@ -21,4 +21,7 @@ public class SqlDatabaseConfiguration
 
     [Required]
     public string ConnectionString { get; set; } = null!;
+
+    [Range(1, int.MaxValue)]
+    public int CommandTimeout { get; set; } = 300;
 }
diff --git a/DatabaseMigrator/Program.cs b/DatabaseMigrator/Program.cs
@@ -71,54 +71,63 @@ static IHostBuilder CreateHostBuilder(string[] args)
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.DbConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.Modules.Devices.Infrastructure.Persistence.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.ConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.Modules.Files.Infrastructure.Persistence.Database.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.DbConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.Modules.Messages.Infrastructure.Persistence.Database.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.DbConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.Modules.Quotas.Infrastructure.Persistence.Database.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.DbConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.Modules.Relationships.Infrastructure.Persistence.Database.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.DbConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.Modules.Synchronization.Infrastructure.Persistence.Database.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.DbConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.Modules.Tokens.Infrastructure.Persistence.Database.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.DbConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             Backbone.AdminApi.Infrastructure.Persistence.IServiceCollectionExtensions.AddDatabase(services, options =>
             {
                 options.Provider = parsedConfiguration.Infrastructure.SqlDatabase.Provider;
                 options.ConnectionString = parsedConfiguration.Infrastructure.SqlDatabase.ConnectionString;
+                options.CommandTimeout = parsedConfiguration.Infrastructure.SqlDatabase.CommandTimeout;
             });
 
             #endregion

diff --git a/Modules/Challenges/src/Challenges.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Challenges/src/Challenges.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -27,7 +27,7 @@ public static void AddDatabase(this IServiceCollection services, Action<DbOption
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Challenges");
@@ -36,7 +36,7 @@ public static void AddDatabase(this IServiceCollection services, Action<DbOption
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Challenges");
@@ -54,6 +54,7 @@ public class DbOptions
     {
         public string Provider { get; set; } = null!;
         public string DbConnectionString { get; set; } = null!;
+        public int CommandTimeout { get; set; } = 20;
         public RetryOptions RetryOptions { get; set; } = new();
     }
 

diff --git a/Modules/Devices/src/Devices.Infrastructure/Persistence/IServiceCollectionExtensions.cs b/Modules/Devices/src/Devices.Infrastructure/Persistence/IServiceCollectionExtensions.cs
@@ -29,7 +29,7 @@ public static void AddDatabase(this IServiceCollection services, Action<DbOption
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.ConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Devices");
@@ -38,7 +38,7 @@ public static void AddDatabase(this IServiceCollection services, Action<DbOption
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.ConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Devices");
@@ -47,6 +47,7 @@ public static void AddDatabase(this IServiceCollection services, Action<DbOption
                     default:
                         throw new Exception($"Unsupported database provider: {options.Provider}");
                 }
+
                 dbContextOptions.UseOpenIddict<
                     CustomOpenIddictEntityFrameworkCoreApplication,
                     CustomOpenIddictEntityFrameworkCoreAuthorization,
@@ -72,6 +73,7 @@ public class DbOptions
     {
         public string Provider { get; set; } = null!;
         public string ConnectionString { get; set; } = null!;
+        public int CommandTimeout { get; set; } = 20;
         public RetryOptions RetryOptions { get; set; } = new();
     }
 

diff --git a/Modules/Files/src/Files.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs b/Modules/Files/src/Files.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
@@ -30,7 +30,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Files");
@@ -39,7 +39,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Files");
@@ -58,6 +58,7 @@ public class DbOptions
 {
     public string Provider { get; set; } = null!;
     public string DbConnectionString { get; set; } = null!;
+    public int CommandTimeout { get; set; } = 20;
     public RetryOptions RetryOptions { get; set; } = new();
 }
 

diff --git a/...Messages/src/Messages.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs b/...Messages/src/Messages.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
@@ -29,7 +29,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Messages");
@@ -38,7 +38,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Messages");
@@ -55,6 +55,7 @@ public class DbOptions
 {
     public string Provider { get; set; } = null!;
     public string DbConnectionString { get; set; } = null!;
+    public int CommandTimeout { get; set; } = 20;
     public RetryOptions RetryOptions { get; set; } = new();
 }
 

diff --git a/...les/Quotas/src/Quotas.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs b/...les/Quotas/src/Quotas.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
@@ -33,7 +33,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Quotas");
@@ -42,7 +42,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Quotas");
@@ -67,6 +67,7 @@ public class DbOptions
     {
         public string Provider { get; set; } = null!;
         public string DbConnectionString { get; set; } = null!;
+        public int CommandTimeout { get; set; } = 20;
         public RetryOptions RetryOptions { get; set; } = new();
     }
 

diff --git a/...ips/src/Relationships.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs b/...ips/src/Relationships.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
@@ -29,7 +29,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Relationships");
@@ -38,7 +38,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Relationships");
@@ -54,6 +54,7 @@ public class DbOptions
     {
         public string Provider { get; set; } = null!;
         public string DbConnectionString { get; set; } = null!;
+        public int CommandTimeout { get; set; } = 20;
         public RetryOptions RetryOptions { get; set; } = new();
     }
 

diff --git a/...n/src/Synchronization.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs b/...n/src/Synchronization.Infrastructure/Persistence/Database/IServiceCollectionExtensions.cs
@@ -30,7 +30,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case SQLSERVER:
                         dbContextOptions.UseSqlServer(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(SQLSERVER_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Synchronization");
@@ -39,7 +39,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
                     case POSTGRES:
                         dbContextOptions.UseNpgsql(options.DbConnectionString, sqlOptions =>
                         {
-                            sqlOptions.CommandTimeout(20);
+                            sqlOptions.CommandTimeout(options.CommandTimeout);
                             sqlOptions.MigrationsAssembly(POSTGRES_MIGRATIONS_ASSEMBLY);
                             sqlOptions.EnableRetryOnFailure(options.RetryOptions.MaxRetryCount, TimeSpan.FromSeconds(options.RetryOptions.MaxRetryDelayInSeconds), null);
                             sqlOptions.MigrationsHistoryTable(HistoryRepository.DefaultTableName, "Synchronization");
@@ -57,6 +57,7 @@ public static void AddDatabase(this IServiceCollection services, DbOptions optio
 public class DbOptions
 {
     public string Provider { get; set; } = null!;
+    public int CommandTimeout { get; set; } = 20;
     public string DbConnectionString { get; set; } = null!;
     public RetryOptions RetryOptions { get; set; } = new();
 }