Improve graceful shutdown (#481)

* Fire new `ServerShuttingDown` method

* Fix graceful shutdowns blocking on `ConnectionState`s

This would cause the server to never gracefully shutdown for one of two
reasons:

- On exception, connection states are not cleaned up.
- Clients may choose to remain on an old server forever.

* Update game packages

Author: peppy

SampleMultiplayerClient/MultiplayerClient.cs

@@ -410,5 +410,10 @@ public async Task DisconnectRequested()
             Console.WriteLine("Disconnect requested");
             await LeaveRoom();
         }
+
+        public Task ServerShuttingDown()
+        {
+            return Task.CompletedTask;
+        }
     }
 }

SampleMultiplayerClient/SampleMultiplayerClient.csproj

@@ -11,7 +11,7 @@
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="10.0.5" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.0.5" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.5" />
-        <PackageReference Include="ppy.osu.Game" Version="2026.429.0" />
+        <PackageReference Include="ppy.osu.Game" Version="2026.505.0" />
     </ItemGroup>
 
 </Project>

SampleSpectatorClient/SampleSpectatorClient.csproj

@@ -11,7 +11,7 @@
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="10.0.5" />
         <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="10.0.5" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.5" />
-        <PackageReference Include="ppy.osu.Game" Version="2026.429.0" />
+        <PackageReference Include="ppy.osu.Game" Version="2026.505.0" />
     </ItemGroup>
 
 </Project>

SampleSpectatorClient/SpectatorClient.cs

@@ -90,5 +90,11 @@ public Task DisconnectRequested()
             Console.WriteLine($"{connection.ConnectionId} Disconnect requested");
             return Task.CompletedTask;
         }
+
+        public Task ServerShuttingDown()
+        {
+            Console.WriteLine($"{connection.ConnectionId} Shutdown requested");
+            return Task.CompletedTask;
+        }
     }
 }

osu.Server.Spectator.Tests/Multiplayer/DelegatingMultiplayerClient.cs

@@ -264,5 +264,11 @@ public async Task DisconnectRequested()
             foreach (var c in Clients.OfType<IMultiplayerClient>())
                 await c.DisconnectRequested();
         }
+
+        public async Task ServerShuttingDown()
+        {
+            foreach (var c in Clients.OfType<IMultiplayerClient>())
+                await c.ServerShuttingDown();
+        }
     }
 }

osu.Server.Spectator/ConcurrentConnectionLimiter.cs

@@ -110,6 +110,9 @@ public async Task OnDisconnectedAsync(HubLifetimeContext context, Exception? exc
         {
             // if `exception` isn't null then the disconnection is not clean,
             // so don't unregister yet in hopes that the user will return after a transient network failure or similar.
+            //
+            // TODO: This is never cleaned up properly, leading to gradual user state leakage.
+            // Maybe not a huge concern, but is persistent in memory until restart.
             if (exception == null)
                 await unregisterConnection(context, exception);
             await next(context, exception);

osu.Server.Spectator/GracefulShutdownManager.cs

@@ -7,8 +7,10 @@
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.SignalR;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using osu.Game.Online;
 using osu.Game.Online.Multiplayer;
 using osu.Server.Spectator.Entities;
 using osu.Server.Spectator.Hubs;
@@ -30,31 +32,40 @@ public class GracefulShutdownManager
 
         private readonly List<IEntityStore> dependentStores = new List<IEntityStore>();
         private readonly EntityStore<ServerMultiplayerRoom> roomStore;
+        private readonly IHubContext<MetadataHub> metadataHub;
+        private readonly IHubContext<MultiplayerHub> multiplayerHub;
+        private readonly IHubContext<SpectatorHub> spectatorHub;
         private readonly BuildUserCountUpdater buildUserCountUpdater;
         private readonly ILogger logger;
 
         public GracefulShutdownManager(
             EntityStore<ServerMultiplayerRoom> roomStore,
-            EntityStore<SpectatorClientState> clientStateStore,
+            EntityStore<SpectatorClientState> spectatorState,
+            IHubContext<MetadataHub> metadataHub,
+            IHubContext<MultiplayerHub> multiplayerHub,
+            IHubContext<SpectatorHub> spectatorHub,
             IHostApplicationLifetime hostApplicationLifetime,
             ScoreUploader scoreUploader,
-            EntityStore<ConnectionState> connectionStateStore,
             EntityStore<MetadataClientState> metadataClientStore,
             BuildUserCountUpdater buildUserCountUpdater,
             ILoggerFactory loggerFactory)
         {
             this.roomStore = roomStore;
+
+            this.metadataHub = metadataHub;
+            this.multiplayerHub = multiplayerHub;
+            this.spectatorHub = spectatorHub;
+
             this.buildUserCountUpdater = buildUserCountUpdater;
             logger = loggerFactory.CreateLogger(nameof(GracefulShutdownManager));
 
             dependentStores.Add(roomStore);
-            dependentStores.Add(clientStateStore);
+            dependentStores.Add(spectatorState);
             dependentStores.Add(scoreUploader);
-            dependentStores.Add(connectionStateStore);
             dependentStores.Add(metadataClientStore);
 
             // Importantly, we don't block on `MultiplayerClientState` because they're only relevant as long as a `ServerMultiplayerRoom` exists in the first place.
-            // More so, we want to allow these states to be created so existing rooms can continue to function until they are disbanded.
+            // More so, we want to allow these states to be created so existing rooms can continue to function until they are disbanded (see `StopAcceptingEntities`).
             // Same logic applies to `RefereeClientState`.
 
             hostApplicationLifetime.ApplicationStopping.Register(shutdownSafely);
@@ -71,6 +82,9 @@ private void shutdownSafely()
             foreach (var store in dependentStores)
                 store.StopAcceptingEntities();
 
+            foreach (var clients in new[] { metadataHub.Clients, spectatorHub.Clients, multiplayerHub.Clients })
+                clients.All.SendCoreAsync(nameof(IStatefulUserHubClient.ServerShuttingDown), Array.Empty<object>());
+
             performOnAllRooms(async r =>
             {
                 await r.StartCountdown(new ServerShuttingDownCountdown
@@ -79,7 +93,7 @@ await r.StartCountdown(new ServerShuttingDownCountdown
                 });
             }).Wait();
 
-            TimeSpan timeWaited = new TimeSpan();
+            TimeSpan timeWaited = TimeSpan.Zero;
             TimeSpan timeBetweenChecks = TimeSpan.FromSeconds(10);
 
             var stringBuilder = new StringBuilder();

osu.Server.Spectator/osu.Server.Spectator.csproj

@@ -16,11 +16,11 @@
         <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.10" />
         <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
         <PackageReference Include="OpenSkillSharp" Version="1.1.0" />
-        <PackageReference Include="ppy.osu.Game" Version="2026.429.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2026.429.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2026.429.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2026.429.0" />
-        <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2026.429.0" />
+        <PackageReference Include="ppy.osu.Game" Version="2026.505.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Catch" Version="2026.505.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Mania" Version="2026.505.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Osu" Version="2026.505.0" />
+        <PackageReference Include="ppy.osu.Game.Rulesets.Taiko" Version="2026.505.0" />
         <PackageReference Include="ppy.osu.Server.OsuQueueProcessor" Version="2026.317.0" />
         <PackageReference Include="Sentry.AspNetCore" Version="6.2.0" />
     </ItemGroup>