actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-14 22:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change the logic for printing Service Containers logs

Browse Source 
Service container logs will be printed in the 'Start containers' section only if there is an error.
Healthy services will have their logs printed in the 'Stop Containers' section.
This commit is contained in:
JoannaaKL
2022-09-08 15:49:59 +00:00
parent 354c8bcbed
commit f0b315c911
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Runner.Worker/Container/ContainerInfo.cs
View File

@@ -92,6 +92,8 @@ namespace GitHub.Runner.Worker.Container
public bool IsJobContainer { get; set; }
public bool IsAlpine { get; set; }
public bool IsHealthy { get; set; } = true;
public IDictionary<string, string> ContainerEnvironmentVariables
{
get

34
src/Runner.Worker/ContainerOperationProvider.cs
View File

@@ -89,6 +89,7 @@ namespace GitHub.Runner.Worker
executionContext.Output("##[group]Create local container network");
var containerNetwork = $"github_network_{Guid.NewGuid().ToString("N")}";
await CreateContainerNetworkAsync(executionContext, containerNetwork);
executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork);
executionContext.Output("##[endgroup]");
@@ -99,11 +100,27 @@ namespace GitHub.Runner.Worker
}
executionContext.Output("Waiting for all services to be ready");
bool IsAnyUnhealthy = false;
foreach (var container in containers.Where(c => !c.IsJobContainer))
{
var healthcheck = await Healthcheck(executionContext, container);
if (!string.Equals(healthcheck, "healthy", StringComparison.OrdinalIgnoreCase))
{
IsAnyUnhealthy = true;
}
await ContainerHealthcheckLogs(executionContext, container, healthcheck);
}
if (IsAnyUnhealthy) throw new InvalidOperationException("One or more containers failed to start.");
}
public void printHello()
{
Console.WriteLine("Hello World");
// create an array of strings
}
public async Task StopContainersAsync(IExecutionContext executionContext, object data)
@@ -299,10 +316,11 @@ namespace GitHub.Runner.Worker
if (!string.IsNullOrEmpty(container.ContainerId))
{
if (!container.IsJobContainer)
if (!container.IsJobContainer && container.IsHealthy)
{
var healthcheck = await Healthcheck(executionContext, container);
if (string.Equals(healthcheck, "healthy", StringComparison.OrdinalIgnoreCase)){
if (string.Equals(healthcheck, "healthy", StringComparison.OrdinalIgnoreCase))
{
// Print logs for service container jobs (not the "action" job itself b/c that's already logged).
// Print them only if the service was healthy, else they were already logged via ContainerHealthCheckLogs.
executionContext.Output($"Print service container logs: {container.ContainerDisplayName}");
@@ -312,7 +330,7 @@ namespace GitHub.Runner.Worker
{
executionContext.Warning($"Docker logs fail with exit code {logsExitCode}");
}
}
}
}
executionContext.Output($"Stop and remove container: {container.ContainerDisplayName}");
@@ -399,7 +417,8 @@ namespace GitHub.Runner.Worker
}
}
public async Task<string> Healthcheck(IExecutionContext executionContext, ContainerInfo container){
public async Task<string> Healthcheck(IExecutionContext executionContext, ContainerInfo container)
{
string healthCheck = "--format=\"{{if .Config.Healthcheck}}{{print .State.Health.Status}}{{end}}\"";
string serviceHealth = (await _dockerManager.DockerInspect(context: executionContext, dockerObject: container.ContainerId, options: healthCheck)).FirstOrDefault();
if (string.IsNullOrEmpty(serviceHealth))
@@ -421,17 +440,18 @@ namespace GitHub.Runner.Worker
public async Task ContainerHealthcheckLogs(IExecutionContext executionContext, ContainerInfo container, string serviceHealth)
{
if (string.Equals(serviceHealth, "healthy", StringComparison.OrdinalIgnoreCase))
{
executionContext.Output($"{container.ContainerNetworkAlias} service is healthy.");
}
else
{
executionContext.Output($"##[group]Container {container.ContainerImage} failed healthchecks, printing logs:");
executionContext.Output($"Container {container.ContainerImage} failed healthchecks, printing logs:");
await _dockerManager.DockerLogs(context: executionContext, containerId: container.ContainerId);
executionContext.Error($"Failed to initialize container {container.ContainerImage}");
executionContext.Output("##[endgroup]");
container.IsHealthy = false;
}
}