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

Improve retry handling based on feedback (#1447)

Browse Source
This commit is contained in:
Julio Barba
2021-10-29 16:04:34 -04:00
committed by GitHub
parent 67ba8a7d42
commit b6dbf42746
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Runner.Common/JobServer.cs
View File

@@ -38,7 +38,8 @@ namespace GitHub.Runner.Common
public async Task ConnectAsync(VssConnection jobConnection) public async Task ConnectAsync(VssConnection jobConnection)
{ {
_connection = jobConnection; _connection = jobConnection;
int attemptCount = 5; int totalAttempts = 5;
int attemptCount = totalAttempts;
var configurationStore = HostContext.GetService<IConfigurationStore>(); var configurationStore = HostContext.GetService<IConfigurationStore>();
var runnerSettings = configurationStore.GetSettings(); var runnerSettings = configurationStore.GetSettings();
@@ -56,18 +57,21 @@ namespace GitHub.Runner.Common
if (runnerSettings.IsHostedServer) if (runnerSettings.IsHostedServer)
{ {
await CheckNetworkEndpointsAsync(); await CheckNetworkEndpointsAsync(attemptCount);
} }
} }
await Task.Delay(100); int attempt = totalAttempts - attemptCount;
TimeSpan backoff = BackoffTimerHelper.GetExponentialBackoff(attempt, TimeSpan.FromMilliseconds(100), TimeSpan.FromSeconds(3.2), TimeSpan.FromMilliseconds(100));
await Task.Delay(backoff);
} }
_taskClient = _connection.GetClient<TaskHttpClient>(); _taskClient = _connection.GetClient<TaskHttpClient>();
_hasConnection = true; _hasConnection = true;
} }
private async Task CheckNetworkEndpointsAsync() private async Task CheckNetworkEndpointsAsync(int attemptsLeft)
{ {
try try
{ {
@@ -79,8 +83,8 @@ namespace GitHub.Runner.Common
actionsClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents); actionsClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
// Call the _apis/health endpoint // Call the _apis/health endpoint, and include how many attempts are left as a URL query for easy tracking
var response = await actionsClient.GetAsync(new Uri(baseUri, "_apis/health")); var response = await actionsClient.GetAsync(new Uri(baseUri, $"_apis/health?_internalRunnerAttemptsLeft={attemptsLeft}"));
Trace.Info($"Actions health status code: {response.StatusCode}"); Trace.Info($"Actions health status code: {response.StatusCode}");
} }
} }
@@ -100,8 +104,8 @@ namespace GitHub.Runner.Common
{ {
gitHubClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents); gitHubClient.DefaultRequestHeaders.UserAgent.AddRange(HostContext.UserAgents);
// Call the api.github.com endpoint // Call the api.github.com endpoint, and include how many attempts are left as a URL query for easy tracking
var response = await gitHubClient.GetAsync("https://api.github.com"); var response = await gitHubClient.GetAsync($"https://api.github.com?_internalRunnerAttemptsLeft={attemptsLeft}");
Trace.Info($"api.github.com status code: {response.StatusCode}"); Trace.Info($"api.github.com status code: {response.StatusCode}");
} }
} }