actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-10 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary field 'UnhealthyContainers'

Browse Source
This commit is contained in:
JoannaaKL
2022-09-13 13:47:58 +00:00
parent 3c88e14ca5
commit 47ead99c13
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Runner.Worker/Container/DockerCommandManager.cs
View File

@@ -16,7 +16,6 @@ namespace GitHub.Runner.Worker.Container
{ {
string DockerPath { get; } string DockerPath { get; }
string DockerInstanceLabel { get; } string DockerInstanceLabel { get; }
IList<ContainerInfo> UnhealthyContainers {get; set; }
Task<DockerVersion> DockerVersion(IExecutionContext context); Task<DockerVersion> DockerVersion(IExecutionContext context);
Task<int> DockerPull(IExecutionContext context, string image); Task<int> DockerPull(IExecutionContext context, string image);
Task<int> DockerPull(IExecutionContext context, string image, string configFileDirectory); Task<int> DockerPull(IExecutionContext context, string image, string configFileDirectory);
@@ -43,8 +42,6 @@ namespace GitHub.Runner.Worker.Container
public string DockerInstanceLabel { get; private set; } public string DockerInstanceLabel { get; private set; }
public IList<ContainerInfo> UnhealthyContainers {get; set; }
public override void Initialize(IHostContext hostContext) public override void Initialize(IHostContext hostContext)
{ {
base.Initialize(hostContext); base.Initialize(hostContext);

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

@@ -101,14 +101,14 @@ namespace GitHub.Runner.Worker
executionContext.Output("##[group]Waiting for all services to be ready"); executionContext.Output("##[group]Waiting for all services to be ready");
_dockerManager.UnhealthyContainers = new List<ContainerInfo>(); var unhealthyContainers = new List<ContainerInfo>();
foreach (var container in containers.Where(c => !c.IsJobContainer)) foreach (var container in containers.Where(c => !c.IsJobContainer))
{ {
var healthcheck = await Healthcheck(executionContext, container); var healthcheck = await Healthcheck(executionContext, container);
if (!string.Equals(healthcheck, "healthy", StringComparison.OrdinalIgnoreCase)) if (!string.Equals(healthcheck, "healthy", StringComparison.OrdinalIgnoreCase))
{ {
_dockerManager.UnhealthyContainers.Add(container); unhealthyContainers.Add(container);
} }
else else
{ {
@@ -117,9 +117,9 @@ namespace GitHub.Runner.Worker
} }
executionContext.Output("##[endgroup]"); executionContext.Output("##[endgroup]");
if (_dockerManager.UnhealthyContainers.Count > 0) if (unhealthyContainers.Count > 0)
{ {
foreach (var container in _dockerManager.UnhealthyContainers) foreach (var container in unhealthyContainers)
{ {
executionContext.Output($"##[group]Service container {container.ContainerNetworkAlias} failed."); executionContext.Output($"##[group]Service container {container.ContainerNetworkAlias} failed.");
await ContainerErrorLogs(executionContext, container); await ContainerErrorLogs(executionContext, container);