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

Merge pull request #1585 from tgstation/CIFixes

Browse Source 
Fixes for nightly build errors
This commit is contained in:
Jordan Dominion
2023-07-07 13:28:07 -04:00
committed by GitHub
parent 25a616117b a705339fdd
commit 15d1d6d444
3 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/WindowsWatchdog.cs
+1
View File
@@ -186,6 +186,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
? LogLevel.Warning
: LogLevel.Trace,
"Releasing old deployment {compileJobId}{afterTimeout}",
currentCompileJobId,
timedOut
? " due to timeout!"
: "...");
src/Tgstation.Server.Host/Swarm/SwarmService.cs
+20 -18
View File
@@ -106,9 +106,9 @@ namespace Tgstation.Server.Host.Swarm
readonly List<SwarmServerResponse> swarmServers;
/// <summary>
/// <see cref="Dictionary{TKey, TValue}"/> of <see cref="Api.Models.Internal.SwarmServer.Identifier"/>s to registration <see cref="Guid"/>s.
/// <see cref="Dictionary{TKey, TValue}"/> of <see cref="Api.Models.Internal.SwarmServer.Identifier"/>s to registration <see cref="Guid"/>s and when they were created.
/// </summary>
readonly Dictionary<string, Guid> registrationIds;
readonly Dictionary<string, (Guid, DateTimeOffset)> registrationIdsAndTimes;
/// <summary>
/// If the current server is the swarm controller.
@@ -192,7 +192,7 @@ namespace Tgstation.Server.Host.Swarm
serverHealthCheckCancellationTokenSource = new CancellationTokenSource();
forceHealthCheckTcs = new TaskCompletionSource();
if (swarmController)
registrationIds = new Dictionary<string, Guid>();
registrationIdsAndTimes = new ();
swarmServers = new List<SwarmServerResponse>
{
@@ -486,7 +486,7 @@ namespace Tgstation.Server.Host.Swarm
.Where(x => !x.Controller)
.Select(SendUnregistrationRequest));
swarmServers.RemoveRange(1, swarmServers.Count - 1);
registrationIds.Clear();
registrationIdsAndTimes.Clear();
}
await task;
@@ -517,7 +517,7 @@ namespace Tgstation.Server.Host.Swarm
{
if (swarmController)
lock (swarmServers)
return registrationIds.Values.Any(x => x == registrationId);
return registrationIdsAndTimes.Values.Any(x => x.Item1 == registrationId);
if (registrationId != controllerRegistration)
return false;
@@ -546,9 +546,9 @@ namespace Tgstation.Server.Host.Swarm
lock (swarmServers)
{
if (registrationIds.Any(x => x.Value == registrationId))
if (registrationIdsAndTimes.Any(x => x.Value.Item1 == registrationId))
{
var preExistingRegistrationKvp = registrationIds.FirstOrDefault(x => x.Value == registrationId);
var preExistingRegistrationKvp = registrationIdsAndTimes.FirstOrDefault(x => x.Value.Item1 == registrationId);
if (preExistingRegistrationKvp.Key == node.Identifier)
{
logger.LogWarning("Node {nodeId} has already registered!", node.Identifier);
@@ -563,11 +563,11 @@ namespace Tgstation.Server.Host.Swarm
return false;
}
if (registrationIds.TryGetValue(node.Identifier, out var oldRegistration))
if (registrationIdsAndTimes.TryGetValue(node.Identifier, out var oldRegistration))
{
logger.LogInformation("Node {nodeId} is re-registering without first unregistering. Indicative of restart.", node.Identifier);
swarmServers.RemoveAll(x => x.Identifier == node.Identifier);
registrationIds.Remove(node.Identifier);
registrationIdsAndTimes.Remove(node.Identifier);
}
swarmServers.Add(new SwarmServerResponse
@@ -577,7 +577,7 @@ namespace Tgstation.Server.Host.Swarm
Identifier = node.Identifier,
Controller = false,
});
registrationIds.Add(node.Identifier, registrationId);
registrationIdsAndTimes.Add(node.Identifier, (registrationId, DateTimeOffset.UtcNow));
}
logger.LogInformation("Registered node {nodeId} ({nodeIP}) with ID {registrationId}", node.Identifier, node.Address, registrationId);
@@ -658,7 +658,7 @@ namespace Tgstation.Server.Host.Swarm
lock (swarmServers)
{
swarmServers.RemoveAll(x => x.Identifier == nodeIdentifier);
registrationIds.Remove(nodeIdentifier);
registrationIdsAndTimes.Remove(nodeIdentifier);
}
MarkServersDirty();
@@ -1127,13 +1127,15 @@ namespace Tgstation.Server.Host.Swarm
lock (swarmServers)
{
swarmServers.Remove(swarmServer);
registrationIds.Remove(swarmServer.Identifier);
registrationIdsAndTimes.Remove(swarmServer.Identifier);
}
}
await Task.WhenAll(
currentSwarmServers
.Where(x => !x.Controller)
.Where(node => !node.Controller
&& registrationIdsAndTimes.TryGetValue(node.Identifier, out var registrationAndTime)
&& registrationAndTime.Item2.AddMinutes(SwarmConstants.ControllerHealthCheckIntervalMinutes) < DateTimeOffset.UtcNow)
.Select(HealthRequestForServer));
lock (swarmServers)
@@ -1329,7 +1331,7 @@ namespace Tgstation.Server.Host.Swarm
lock (swarmServers)
{
swarmServers.Remove(swarmServer);
registrationIds.Remove(swarmServer.Identifier);
registrationIdsAndTimes.Remove(swarmServer.Identifier);
}
}
}
@@ -1382,8 +1384,8 @@ namespace Tgstation.Server.Host.Swarm
else if (swarmController)
{
lock (swarmServers)
if (registrationIds.TryGetValue(swarmServer.Identifier, out var registrationId))
request.Headers.Add(SwarmConstants.RegistrationIdHeader, registrationId.ToString());
if (registrationIdsAndTimes.TryGetValue(swarmServer.Identifier, out var registrationIdAndTime))
request.Headers.Add(SwarmConstants.RegistrationIdHeader, registrationIdAndTime.Item1.ToString());
}
else if (controllerRegistration.HasValue)
request.Headers.Add(SwarmConstants.RegistrationIdHeader, controllerRegistration.Value.ToString());
@@ -1498,14 +1500,14 @@ namespace Tgstation.Server.Host.Swarm
lock (swarmServers)
{
var exists = registrationIds.Any(x => x.Value == registrationId);
var exists = registrationIdsAndTimes.Any(x => x.Value.Item1 == registrationId);
if (!exists)
{
logger.LogWarning("A node that was to be looked up ({registrationId}) disappeared from our records!", registrationId);
return null;
}
return registrationIds.First(x => x.Value == registrationId).Key;
return registrationIdsAndTimes.First(x => x.Value.Item1 == registrationId).Key;
}
}
}
tests/Tgstation.Server.Host.Tests/Swarm/TestSwarmProtocol.cs
+1 -1
View File
@@ -135,7 +135,7 @@ namespace Tgstation.Server.Host.Swarm.Tests
Assert.AreEqual(2, controller.Service.GetSwarmServers().Count);
Assert.AreEqual(1, node1.Service.GetSwarmServers().Count);
await DelayMax(() => Assert.AreEqual(2, node1.Service.GetSwarmServers().Count), 15); // node checks every 5 minutes, delays are 100ms
await DelayMax(() => Assert.AreEqual(2, node1.Service.GetSwarmServers().Count));
await controller.SimulateReboot(default);
Assert.AreEqual(SwarmRegistrationResult.Success, await controller.TryInit());