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

Exit hosted runner cleanly during deprovisioning. (#3755)

Browse Source
This commit is contained in:
Tingluo Huang
2025-03-18 10:33:40 -04:00
committed by GitHub
parent 6b08f23b6c
commit a0ba8fd399
7 changed files with 41 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Runner.Common/BrokerServer.cs
View File

@@ -93,7 +93,7 @@ namespace GitHub.Runner.Common
public bool ShouldRetryException(Exception ex)
{
if (ex is AccessDeniedException || ex is RunnerNotFoundException)
if (ex is AccessDeniedException || ex is RunnerNotFoundException || ex is HostedRunnerDeprovisionedException)
{
return false;
}

5
src/Runner.Listener/BrokerMessageListener.cs
View File

@@ -249,6 +249,11 @@ namespace GitHub.Runner.Listener
Trace.Info("Runner OAuth token has been revoked. Unable to pull message.");
throw;
}
catch (HostedRunnerDeprovisionedException)
{
Trace.Info("Hosted runner has been deprovisioned.");
throw;
}
catch (AccessDeniedException e) when (e.ErrorCode == 1)
{
throw;

5
src/Runner.Listener/MessageListener.cs
View File

@@ -304,6 +304,11 @@ namespace GitHub.Runner.Listener
_accessTokenRevoked = true;
throw;
}
catch (HostedRunnerDeprovisionedException)
{
Trace.Info("Hosted runner has been deprovisioned.");
throw;
}
catch (AccessDeniedException e) when (e.ErrorCode == 1)
{
throw;

4
src/Runner.Listener/Runner.cs
View File

@@ -697,6 +697,10 @@ namespace GitHub.Runner.Listener
{
Trace.Info("Runner OAuth token has been revoked. Shutting down.");
}
catch (HostedRunnerDeprovisionedException)
{
Trace.Info("Hosted runner has been deprovisioned. Shutting down.");
}
return Constants.Runner.ReturnCode.Success;
}

1
src/Sdk/RSWebApi/Contracts/BrokerErrorKind.cs
View File

@@ -7,5 +7,6 @@ namespace GitHub.Actions.RunService.WebApi
{
public const string RunnerNotFound = "RunnerNotFound";
public const string RunnerVersionTooOld = "RunnerVersionTooOld";
public const string HostedRunnerDeprovisioned = "HostedRunnerDeprovisioned";
}
}

2
src/Sdk/WebApi/WebApi/BrokerHttpClient.cs
View File

@@ -122,6 +122,8 @@ namespace GitHub.Actions.RunService.WebApi
{
ErrorCode = 1
};
case BrokerErrorKind.HostedRunnerDeprovisioned:
throw new HostedRunnerDeprovisionedException(brokerError.Message);
default:
break;
}

23
src/Sdk/WebApi/WebApi/Exceptions/HostedRunnerDeprovisionedException.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
namespace GitHub.Services.WebApi
{
[Serializable]
public sealed class HostedRunnerDeprovisionedException : Exception
{
public HostedRunnerDeprovisionedException()
: base()
{
}
public HostedRunnerDeprovisionedException(String message)
: base(message)
{
}
public HostedRunnerDeprovisionedException(String message, Exception innerException)
: base(message, innerException)
{
}
}
}