Allow setting shutdown timeout for primary and audit instances

src/ServiceControl.Audit.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt

@@ -28,5 +28,6 @@
   "MaximumConcurrencyLevel": null,
   "ServiceControlQueueAddress": "Particular.ServiceControl",
   "TimeToRestartAuditIngestionAfterFailure": "00:01:00",
-  "EnableFullTextSearchOnBodies": true
+  "EnableFullTextSearchOnBodies": true,
+  "ShutdownTimeout": "00:02:00"
 }

src/ServiceControl.Audit/HostApplicationBuilderExtensions.cs

@@ -45,7 +45,7 @@ public static void AddServiceControlAudit(this IHostApplicationBuilder builder,
         var transportCustomization = TransportFactory.Create(transportSettings);
         transportCustomization.AddTransportForAudit(services, transportSettings);
 
-        services.Configure<HostOptions>(options => options.ShutdownTimeout = TimeSpan.FromSeconds(30));
+        services.Configure<HostOptions>(options => options.ShutdownTimeout = settings.ShutdownTimeout);
 
         services.AddSingleton(settings);
         services.AddSingleton<EndpointInstanceMonitoring>();

src/ServiceControl.Audit/Infrastructure/Settings/Settings.cs

@@ -49,6 +49,7 @@ public Settings(string transportType = null, string persisterType = null, Loggin
             ServiceControlQueueAddress = SettingsReader.Read<string>(SettingsRootNamespace, "ServiceControlQueueAddress");
             TimeToRestartAuditIngestionAfterFailure = GetTimeToRestartAuditIngestionAfterFailure();
             EnableFullTextSearchOnBodies = SettingsReader.Read(SettingsRootNamespace, "EnableFullTextSearchOnBodies", true);
+            ShutdownTimeout = SettingsReader.Read(SettingsRootNamespace, "ShutdownTimeout", ShutdownTimeout);
 
             AssemblyLoadContextResolver = static assemblyPath => new PluginAssemblyLoadContext(assemblyPath);
         }
@@ -152,6 +153,11 @@ public int MaxBodySizeToStore
 
         public bool EnableFullTextSearchOnBodies { get; set; }
 
+        // Windows services allow a maximum of 125 seconds when stopping a service.
+        // When shutting down or restarting the OS we have no control over the
+        // shutdown timeout
+        public TimeSpan ShutdownTimeout { get; set; } = TimeSpan.FromMinutes(2);
+
         public TransportSettings ToTransportSettings()
         {
             var transportSettings = new TransportSettings

src/ServiceControl.UnitTests/ApprovalFiles/APIApprovals.PlatformSampleSettings.approved.txt

@@ -42,5 +42,6 @@
   "MaximumConcurrencyLevel": null,
   "RetryHistoryDepth": 10,
   "RemoteInstances": [],
-  "DisableHealthChecks": false
+  "DisableHealthChecks": false,
+  "ShutdownTimeout": "00:02:00"
 }

src/ServiceControl/HostApplicationBuilderExtensions.cs

@@ -51,7 +51,7 @@ public static void AddServiceControl(this IHostApplicationBuilder hostBuilder, S
             var transportCustomization = TransportFactory.Create(transportSettings);
             transportCustomization.AddTransportForPrimary(services, transportSettings);
 
-            services.Configure<HostOptions>(options => options.ShutdownTimeout = TimeSpan.FromSeconds(30));
+            services.Configure<HostOptions>(options => options.ShutdownTimeout = settings.ShutdownTimeout);
             services.AddSingleton<IDomainEvents, DomainEvents>();
 
             services.AddSingleton<MessageStreamerHub>();

src/ServiceControl/Infrastructure/Settings/Settings.cs

@@ -65,6 +65,7 @@ public Settings(
             TimeToRestartErrorIngestionAfterFailure = GetTimeToRestartErrorIngestionAfterFailure();
             DisableExternalIntegrationsPublishing = SettingsReader.Read(SettingsRootNamespace, "DisableExternalIntegrationsPublishing", false);
             TrackInstancesInitialValue = SettingsReader.Read(SettingsRootNamespace, "TrackInstancesInitialValue", true);
+            ShutdownTimeout = SettingsReader.Read(SettingsRootNamespace, "ShutdownTimeout", ShutdownTimeout);
             AssemblyLoadContextResolver = static assemblyPath => new PluginAssemblyLoadContext(assemblyPath);
         }
 
@@ -180,6 +181,10 @@ public TimeSpan HeartbeatGracePeriod
 
         public bool DisableHealthChecks { get; set; }
 
+        // The default value is set to the maximum allowed time by the most restrictive
+        // hosting platform, which Docker Linux containers. 
+        public TimeSpan ShutdownTimeout { get; set; } = TimeSpan.FromSeconds(10);
+
         public string GetConnectionString()
         {
             var settingsValue = SettingsReader.Read<string>(SettingsRootNamespace, "ConnectionString");

src/ServiceControlInstaller.Engine/Configuration/ServiceControl/ServiceControlAppConfig.cs

@@ -32,6 +32,12 @@ protected override void UpdateSettings()
             settings.Set(ServiceControlSettings.EnableFullTextSearchOnBodies, details.EnableFullTextSearchOnBodies.ToString(), version);
             settings.Set(ServiceControlSettings.RemoteInstances, RemoteInstanceConverter.ToJson(details.RemoteInstances), version);
 
+            // Windows services allow a maximum of 125 seconds when stopping a service.
+            // When shutting down or restarting the OS we have no control over the
+            // shutdown timeout. This is by the installer engine that is run _only_ on
+            // Windows via SCMU or PowerShell
+            settings.Set(ServiceControlSettings.ShutdownTimeout, "00:02:00");
+
             // Retired settings
             settings.RemoveIfRetired(ServiceControlSettings.AuditQueue, version);
             settings.RemoveIfRetired(ServiceControlSettings.AuditLogQueue, version);

src/ServiceControlInstaller.Engine/Configuration/ServiceControl/SettingsList.cs

@@ -89,5 +89,11 @@ public static class ServiceControlSettings
             Name = "ServiceControl/EnableFullTextSearchOnBodies",
             SupportedFrom = new SemanticVersion(4, 17, 0)
         };
+
+        public static SettingInfo ShutdownTimeout = new()
+        {
+            Name = "ServiceControl/ShutdownTimeout",
+            SupportedFrom = new SemanticVersion(6, 4, 0)
+        };
     }
 }