Skip to content

Fix infinite retry loop when runner registration is not found #4330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkw wants to merge 3 commits into
base: main
Choose a base branch
from
+141 −3
Open

Fix infinite retry loop when runner registration is not found #4330

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e22ae66
fix: treat deleted runner registration as non-retryable error
bkw Apr 9, 2026
4f6c72e
test: add L0 tests for invalid_client non-retryable behavior
bkw Apr 9, 2026
7eabbd2
feat: add idle timeout for ephemeral runners waiting for jobs
bkw Apr 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Runner.Common/BrokerServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using GitHub.DistributedTask.WebApi;
using GitHub.Runner.Sdk;
using GitHub.Services.Common;
using GitHub.Services.OAuth;
using GitHub.Services.WebApi;
using Sdk.RSWebApi.Contracts;
using Sdk.WebApi.WebApi.RawClient;
Expand Down Expand Up @@ -113,6 +114,14 @@ public bool ShouldRetryException(Exception ex)
return false;
}

// "invalid_client" means the runner registration has been deleted from the server.
// Retrying will never succeed, so bail out immediately.
if (ex is VssOAuthTokenRequestException oAuthEx &&
string.Equals(oAuthEx.Error, "invalid_client", StringComparison.OrdinalIgnoreCase))
{
return false;
}

return true;
}
}
Expand Down
13 changes: 10 additions & 3 deletions src/Runner.Listener/BrokerMessageListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,11 +444,18 @@ ex is RunnerNotFoundException ||
Trace.Info($"Non-retriable exception: {ex.Message}");
return false;
}
else

// "invalid_client" means the runner registration has been deleted from the server.
// This is permanent — retrying will never succeed.
if (ex is VssOAuthTokenRequestException oAuthEx &&
string.Equals(oAuthEx.Error, "invalid_client", StringComparison.OrdinalIgnoreCase))
{
Trace.Info($"Retriable exception: {ex.Message}");
return true;
Trace.Info($"Non-retriable exception: runner registration deleted. {ex.Message}");
return false;
}

Trace.Info($"Retriable exception: {ex.Message}");
return true;
}

private bool IsSessionCreationExceptionRetriable(Exception ex)
Expand Down
Loading