cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-29 08:00:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition between swarm server startup and health checking

Browse Source
This commit is contained in:
Jordan Brown
2020-12-31 23:22:49 -05:00
parent b50ff9d569
commit a4ade2b78a
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Swarm/SwarmService.cs
+12 -1
View File
@@ -41,6 +41,11 @@ namespace Tgstation.Server.Host.Swarm
/// </summary>
const int UpdateCommitTimeoutMinutes = 10;
/// <summary>
/// Number of seconds between <see cref="forceHealthCheckTcs"/> triggering and a health check being performed.
/// </summary>
const int SecondsToDelayForcedHealthChecks = 15;
/// <summary>
/// See <see cref="JsonSerializerSettings"/> for the swarm system.
/// </summary>
@@ -1060,7 +1065,13 @@ namespace Tgstation.Server.Host.Swarm
await awakeningTask.ConfigureAwait(false);
if (!swarmController && !nextForceHealthCheckTask.IsCompleted)
if (nextForceHealthCheckTask.IsCompleted && swarmController)
{
// Intentionally wait a few seconds for the other server to start up before interogating it
logger.LogTrace("Next health check triggering in {0}s...", SecondsToDelayForcedHealthChecks);
await asyncDelayer.Delay(TimeSpan.FromSeconds(SecondsToDelayForcedHealthChecks), cancellationToken);
}
else if (!swarmController && !nextForceHealthCheckTask.IsCompleted)
{
if (!lastControllerHealthCheck.HasValue)
{