From 1b1c57ac1b9620d942f853095de76bf050af0620 Mon Sep 17 00:00:00 2001 From: Markus Keil Date: Tue, 7 May 2024 17:25:16 +0200 Subject: [PATCH] add runner backchannel for provisioning --- CloudController.cs | 9 ++++++++- Machine.cs | 2 ++ Program.cs | 48 ++++++++++++++++++++++++++++++++++++++++++++-- RunnerQueue.cs | 2 ++ 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/CloudController.cs b/CloudController.cs index 372fdf5..efef49a 100644 --- a/CloudController.cs +++ b/CloudController.cs @@ -138,7 +138,9 @@ public async Task CreateNewRunner(string arch, string size, string runne CreatedAt = DateTime.UtcNow, TargetName = targetName, Size = size, - Arch = arch + Arch = arch, + Profile = profileName, + IsCustom = isCustom }); StoreActiveRunners(); return newSrv.Name; @@ -278,4 +280,9 @@ public List GetRunnersForTarget(string orgName) { return _activeRunners.Where(x => x.TargetName == orgName).ToList(); } + + public Machine GetRunnerByHostname(string hostname) + { + return _activeRunners.FirstOrDefault(x => x.Name == hostname); + } } \ No newline at end of file diff --git a/Machine.cs b/Machine.cs index 3c47e05..c2c51cb 100644 --- a/Machine.cs +++ b/Machine.cs @@ -13,4 +13,6 @@ public class Machine public string TargetName { get; set; } public string Size { get; set; } public string Arch { get; set; } + public string Profile { get; set; } + public bool IsCustom { get; set; } } \ No newline at end of file diff --git a/Program.cs b/Program.cs index e0f6ce5..6a92c6a 100644 --- a/Program.cs +++ b/Program.cs @@ -108,9 +108,51 @@ public static void Main(string[] args) WebApplication app = builder.Build(); + app.MapPost("/runner-state", async (HttpRequest request, + [FromServices] CloudController cloud, [FromServices] ILogger logger, [FromServices] RunnerQueue runnerQueue, [FromQuery] string hostname, [FromQuery] string state) => + { + switch (state) + { + case "ok": + // Remove from provisioning dict + Log.Information($"Runner {hostname} finished provisioning."); + runnerQueue.CreatedRunners.Remove(hostname, out _); + break; + case "error": + Log.Warning($"Runner {hostname} failed provisioning."); + if (request.Form.Files.Count > 0) + { + // Read the log file into a string + using var reader = new StreamReader(request.Form.Files[0].OpenReadStream()); + string fileContent = await reader.ReadToEndAsync(); + Log.Information($"LOGS FROM {hostname}\n\n{fileContent}"); + } + + // Get runner specs + Machine runner = cloud.GetRunnerByHostname(hostname); + + // Queue creation of a new runner + if (!runnerQueue.CreatedRunners.Remove(hostname, out CreateRunnerTask runnerSpec)) + { + logger.LogError($"Unable to get previous settings for {hostname}"); + } + + logger.LogInformation($"Re-creating runner of type [{runnerSpec.Size}, {runnerSpec.Arch}] for {runnerSpec.RepoName}"); + runnerQueue.CreateTasks.Enqueue(runnerSpec); + + // Queue deletion of the failed runner + runnerQueue.DeleteTasks.Enqueue(new DeleteRunnerTask + { + ServerId = runner.Id + }); + break; + } + + return Results.StatusCode(201); + }); + // Prepare pools - app.MapPost("/github-webhook", async (HttpRequest request, [FromServices] CloudController cloud, - [FromServices] ILogger logger, [FromServices] RunnerQueue poolMgr) => + app.MapPost("/github-webhook", async (HttpRequest request, [FromServices] CloudController cloud, [FromServices] ILogger logger, [FromServices] RunnerQueue poolMgr) => { // Verify webhook HMAC - TODO @@ -317,6 +359,8 @@ private static async Task JobQueued(ILogger logger, string repoName, Li return; } + + poolMgr.CreateTasks.Enqueue(new CreateRunnerTask { Arch = arch, diff --git a/RunnerQueue.cs b/RunnerQueue.cs index 146b4a9..9f94f8b 100644 --- a/RunnerQueue.cs +++ b/RunnerQueue.cs @@ -6,4 +6,6 @@ public class RunnerQueue { public ConcurrentQueue CreateTasks { get; } = new(); public ConcurrentQueue DeleteTasks { get; } = new(); + + public ConcurrentDictionary CreatedRunners { get; } = new(); } \ No newline at end of file