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

Remove WatchdogLaunchResult

Browse Source
This commit is contained in:
Jordan Brown
2018-09-25 22:28:31 -04:00
parent 3411f3c4fb
commit 6c5f00dffa
4 changed files with 28 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/IWatchdog.cs
+4 -9
View File
@@ -26,11 +26,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// </summary>
Models.CompileJob ActiveCompileJob { get; }
/// <summary>
/// The latest <see cref="LaunchResult"/> of the twin servers
/// </summary>
LaunchResult LastLaunchResult { get; }
/// <summary>
/// The <see cref="DreamDaemonLaunchParameters"/> the active server is using
/// </summary>
@@ -50,8 +45,8 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// Start the <see cref="IWatchdog"/>
/// </summary>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="WatchdogLaunchResult"/> or <see langword="null"/> if it was already running</returns>
Task<WatchdogLaunchResult> Launch(CancellationToken cancellationToken);
/// <returns>A <see cref="Task"/> representing the running operation</returns>
Task Launch(CancellationToken cancellationToken);
/// <summary>
/// Changes the <see cref="ActiveLaunchParameters"/>. If currently <see cref="Running"/> triggers a graceful restart
@@ -66,8 +61,8 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// </summary>
/// <param name="graceful">If <see langword="true"/> the restart will be delayed until a reboot is detected in the active server's DMAPI and this function will retrun immediately</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation</param>
/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="WatchdogLaunchResult"/> or <see langword="null"/> if it was already running or <paramref name="graceful"/> is <see langword="true"/> and <see cref="Running"/> is <see langword="false"/></returns>
Task<WatchdogLaunchResult> Restart(bool graceful, CancellationToken cancellationToken);
/// <returns>A <see cref="Task"/> representing the running operation</returns>
Task Restart(bool graceful, CancellationToken cancellationToken);
/// <summary>
/// Stops the watchdog
src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+23 -29
View File
@@ -36,9 +36,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
/// <inheritdoc />
public Models.CompileJob ActiveCompileJob => (AlphaIsActive ? alphaServer : bravoServer)?.Dmb.CompileJob;
/// <inheritdoc />
public LaunchResult LastLaunchResult { get; private set; }
/// <inheritdoc />
public DreamDaemonLaunchParameters ActiveLaunchParameters { get; private set; }
@@ -109,7 +106,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
readonly Api.Models.Instance instance;
/// <summary>
/// If the <see cref="Watchdog"/> should <see cref="LaunchNoLock(bool, bool, bool, CancellationToken)"/> in <see cref="StartAsync(CancellationToken)"/>
/// If the <see cref="Watchdog"/> should <see cref="LaunchNoLock(bool, bool, WatchdogReattachInformation, CancellationToken)"/> in <see cref="StartAsync(CancellationToken)"/>
/// </summary>
readonly bool autoStart;
@@ -570,21 +567,29 @@ namespace Tgstation.Server.Host.Components.Watchdog
for (var retryAttempts = 1; monitorState.NextAction == MonitorAction.Restart; ++retryAttempts)
{
WatchdogLaunchResult result;
Exception launchException = null;
using (await SemaphoreSlimContext.Lock(semaphore, cancellationToken).ConfigureAwait(false))
{
result = await LaunchNoLock(false, false, null, cancellationToken).ConfigureAwait(false);
if (Running)
try
{
logger.LogDebug("Relaunch successful, resetting monitor state...");
monitorState = new MonitorState(); //clean the slate
await LaunchNoLock(false, false, null, cancellationToken).ConfigureAwait(false);
if (Running)
{
logger.LogDebug("Relaunch successful, resetting monitor state...");
monitorState = new MonitorState(); //clean the slate
}
}
catch (Exception e)
{
launchException = e;
}
}
await chatTask.ConfigureAwait(false);
if (!Running)
{
logger.LogWarning("Failed to automatically restart the watchdog! Alpha: {0}; Bravo: {1}", result.Alpha.ToString(), result.Bravo.ToString());
if (launchException == null)
logger.LogWarning("Failed to automatically restart the watchdog!");
else
logger.LogWarning("Failed to automatically restart the watchdog! Exception: {0}", launchException);
var retryDelay = Math.Min(Math.Pow(2, retryAttempts), 3600); //max of one hour
chatTask = chat.SendWatchdogMessage(String.Format(CultureInfo.InvariantCulture, "Failed to restart watchdog (Attempt: {0}), retrying in {1} seconds...", retryAttempts, retryDelay), cancellationToken);
await Task.WhenAll(Task.Delay((int)retryDelay, cancellationToken), chatTask).ConfigureAwait(false);
@@ -633,16 +638,13 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
}
async Task<WatchdogLaunchResult> LaunchNoLock(bool startMonitor, bool announce, WatchdogReattachInformation reattachInfo, CancellationToken cancellationToken)
async Task LaunchNoLock(bool startMonitor, bool announce, WatchdogReattachInformation reattachInfo, CancellationToken cancellationToken)
{
logger.LogTrace("Begin LaunchNoLock");
using (var alphaStartCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken))
{
if (Running)
{
logger.LogTrace("Aborted due to already running!");
return null;
}
throw new JobException("Watchdog already running!");
Task chatTask;
//this is necessary, the monitor could be in it's sleep loop trying to restart
@@ -716,7 +718,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
//both servers are now running, alpha is the active server(unless reattach), huzzah
AlphaIsActive = reattachInfo?.AlphaIsActive ?? true;
LastLaunchResult = alphaLrt.Result;
var activeServer = AlphaIsActive ? alphaServer : bravoServer;
activeServer.EnableCustomChatCommands();
@@ -730,11 +731,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
monitorCts = new CancellationTokenSource();
monitorTask = MonitorLifetimes(monitorCts.Token);
}
return new WatchdogLaunchResult
{
Alpha = alphaLrt.Result,
Bravo = bravoLrt.Result
};
}
catch
{
@@ -771,10 +767,10 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
/// <inheritdoc />
public async Task<WatchdogLaunchResult> Launch(CancellationToken cancellationToken)
public async Task Launch(CancellationToken cancellationToken)
{
using (await SemaphoreSlimContext.Lock(semaphore, cancellationToken).ConfigureAwait(false))
return await LaunchNoLock(true, true, null, cancellationToken).ConfigureAwait(false);
await LaunchNoLock(true, true, null, cancellationToken).ConfigureAwait(false);
}
/// <inheritdoc />
@@ -791,7 +787,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
/// <inheritdoc />
public async Task<WatchdogLaunchResult> Restart(bool graceful, CancellationToken cancellationToken)
public async Task Restart(bool graceful, CancellationToken cancellationToken)
{
logger.LogTrace("Begin Restart. Graceful: {0}", graceful);
using (await SemaphoreSlimContext.Lock(semaphore, cancellationToken).ConfigureAwait(false))
@@ -806,9 +802,8 @@ namespace Tgstation.Server.Host.Components.Watchdog
}
else
chatTask = Task.CompletedTask;
var result = await LaunchNoLock(true, !Running, null, cancellationToken).ConfigureAwait(false);
await LaunchNoLock(true, !Running, null, cancellationToken).ConfigureAwait(false);
await chatTask.ConfigureAwait(false);
return result;
}
var toReboot = AlphaIsActive ? alphaServer : bravoServer;
if (toReboot != null)
@@ -816,7 +811,6 @@ namespace Tgstation.Server.Host.Components.Watchdog
if (!await toReboot.SetRebootState(Components.Watchdog.RebootState.Restart, cancellationToken).ConfigureAwait(false))
logger.LogWarning("Unable to send reboot state change event!");
}
return null;
}
}
src/Tgstation.Server.Host/Components/Watchdog/WatchdogLaunchResult.cs
-20
View File
@@ -1,20 +0,0 @@
using System;
namespace Tgstation.Server.Host.Components.Watchdog
{
/// <summary>
/// Launch results for a <see cref="IWatchdog"/>
/// </summary>
public sealed class WatchdogLaunchResult
{
/// <summary>
/// The <see cref="LaunchResult"/> for the alpha process
/// </summary>
public LaunchResult Alpha { get; set; }
/// <summary>
/// The <see cref="LaunchResult"/> for the bravo process
/// </summary>
public LaunchResult Bravo { get; set; }
}
}
src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
+1 -8
View File
@@ -66,14 +66,7 @@ namespace Tgstation.Server.Host.Controllers
Instance = Instance,
StartedBy = AuthenticationContext.User
};
await jobManager.RegisterOperation(job,
async (paramJob, databaseContext, progressHandler, innerCt) =>
{
var result = await instance.Watchdog.Launch(innerCt).ConfigureAwait(false);
if (result == null)
throw new JobException("Watchdog already running!");
},
cancellationToken).ConfigureAwait(false);
await jobManager.RegisterOperation(job, (paramJob, databaseContext, progressHandler, innerCt) => instance.Watchdog.Launch(innerCt), cancellationToken).ConfigureAwait(false);
return Accepted(job.ToApi());
}