From dbf8db60bffdf724a2786e0823211e0e8c142aae Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Thu, 31 Dec 2020 16:47:41 -0500 Subject: [PATCH] Add a 5 second delay between swarm registration attempts --- src/Tgstation.Server.Host/Components/InstanceManager.cs | 3 +++ src/Tgstation.Server.Host/Swarm/SwarmService.cs | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/Tgstation.Server.Host/Components/InstanceManager.cs b/src/Tgstation.Server.Host/Components/InstanceManager.cs index 4e272e0012..f4526b2e09 100644 --- a/src/Tgstation.Server.Host/Components/InstanceManager.cs +++ b/src/Tgstation.Server.Host/Components/InstanceManager.cs @@ -565,6 +565,9 @@ namespace Tgstation.Server.Host.Components if (registrationResult == SwarmRegistrationResult.VersionMismatch) throw new InvalidOperationException("Swarm controller's TGS version does not match our own!"); + + if (registrationResult != SwarmRegistrationResult.Success) + await asyncDelayer.Delay(TimeSpan.FromSeconds(5), cancellationToken); } while (registrationResult != SwarmRegistrationResult.Success && !cancellationToken.IsCancellationRequested); } diff --git a/src/Tgstation.Server.Host/Swarm/SwarmService.cs b/src/Tgstation.Server.Host/Swarm/SwarmService.cs index 643e85af87..919cd51d28 100644 --- a/src/Tgstation.Server.Host/Swarm/SwarmService.cs +++ b/src/Tgstation.Server.Host/Swarm/SwarmService.cs @@ -821,6 +821,8 @@ namespace Tgstation.Server.Host.Swarm logger.LogError("Swarm re-registration failed, controller's TGS version has changed!"); break; } + + await asyncDelayer.Delay(TimeSpan.FromSeconds(5), cancellationToken); } // we could do something here... but what?