From 47ead99c13b3960507d68c28f7375e70812a2e8d Mon Sep 17 00:00:00 2001 From: JoannaaKL Date: Tue, 13 Sep 2022 13:47:58 +0000 Subject: [PATCH] Remove unnecessary field 'UnhealthyContainers' --- src/Runner.Worker/Container/DockerCommandManager.cs | 3 --- src/Runner.Worker/ContainerOperationProvider.cs | 8 ++++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/Runner.Worker/Container/DockerCommandManager.cs b/src/Runner.Worker/Container/DockerCommandManager.cs index 8e32aeb84..a0c158bdf 100644 --- a/src/Runner.Worker/Container/DockerCommandManager.cs +++ b/src/Runner.Worker/Container/DockerCommandManager.cs @@ -16,7 +16,6 @@ namespace GitHub.Runner.Worker.Container { string DockerPath { get; } string DockerInstanceLabel { get; } - IList UnhealthyContainers {get; set; } Task DockerVersion(IExecutionContext context); Task DockerPull(IExecutionContext context, string image); Task DockerPull(IExecutionContext context, string image, string configFileDirectory); @@ -43,8 +42,6 @@ namespace GitHub.Runner.Worker.Container public string DockerInstanceLabel { get; private set; } - public IList UnhealthyContainers {get; set; } - public override void Initialize(IHostContext hostContext) { base.Initialize(hostContext); diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs index 103f1c36a..3fbac07d9 100644 --- a/src/Runner.Worker/ContainerOperationProvider.cs +++ b/src/Runner.Worker/ContainerOperationProvider.cs @@ -101,14 +101,14 @@ namespace GitHub.Runner.Worker executionContext.Output("##[group]Waiting for all services to be ready"); - _dockerManager.UnhealthyContainers = new List(); + var unhealthyContainers = new List(); foreach (var container in containers.Where(c => !c.IsJobContainer)) { var healthcheck = await Healthcheck(executionContext, container); if (!string.Equals(healthcheck, "healthy", StringComparison.OrdinalIgnoreCase)) { - _dockerManager.UnhealthyContainers.Add(container); + unhealthyContainers.Add(container); } else { @@ -117,9 +117,9 @@ namespace GitHub.Runner.Worker } 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."); await ContainerErrorLogs(executionContext, container);