mirror of
https://github.com/actions/runner.git
synced 2025-12-10 12:36:23 +00:00
Compare commits
2 Commits
v2.311.0
...
users/tako
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0d1eb56adb | ||
|
|
fa0dd79c30 |
@@ -13,6 +13,12 @@ using GitHub.Runner.Listener.Configuration;
|
|||||||
using GitHub.Runner.Sdk;
|
using GitHub.Runner.Sdk;
|
||||||
using GitHub.Services.WebApi;
|
using GitHub.Services.WebApi;
|
||||||
using Pipelines = GitHub.DistributedTask.Pipelines;
|
using Pipelines = GitHub.DistributedTask.Pipelines;
|
||||||
|
using GitHub.DistributedTask.Pipelines;
|
||||||
|
using GitHub.Services.Common;
|
||||||
|
using System.Runtime.Serialization;
|
||||||
|
using System.Net;
|
||||||
|
using System.Net.Http;
|
||||||
|
using System.Net.Http.Headers;
|
||||||
|
|
||||||
namespace GitHub.Runner.Listener
|
namespace GitHub.Runner.Listener
|
||||||
{
|
{
|
||||||
@@ -477,7 +483,14 @@ namespace GitHub.Runner.Listener
|
|||||||
// todo: add retries https://github.com/github/actions-broker/issues/49
|
// todo: add retries https://github.com/github/actions-broker/issues/49
|
||||||
var runServer = HostContext.CreateService<IRunServer>();
|
var runServer = HostContext.CreateService<IRunServer>();
|
||||||
await runServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
|
await runServer.ConnectAsync(new Uri(settings.ServerUrl), creds);
|
||||||
var jobMessage = await runServer.GetJobMessageAsync(messageRef.RunnerRequestId);
|
|
||||||
|
var jobMessage = await RetriesHelper<AgentJobRequestMessage>.RetryWithTimeoutAsync(async () =>
|
||||||
|
{
|
||||||
|
return await runServer.GetJobMessageAsync(messageRef.RunnerRequestId);
|
||||||
|
},
|
||||||
|
TimeSpan.FromSeconds(5),
|
||||||
|
TimeSpan.FromSeconds(10),
|
||||||
|
5);
|
||||||
|
|
||||||
jobDispatcher.Run(jobMessage, runOnce);
|
jobDispatcher.Run(jobMessage, runOnce);
|
||||||
if (runOnce)
|
if (runOnce)
|
||||||
|
|||||||
41
src/Sdk/Common/Common/Utility/RetriesHelper.cs
Normal file
41
src/Sdk/Common/Common/Utility/RetriesHelper.cs
Normal file
@@ -0,0 +1,41 @@
|
|||||||
|
using System;
|
||||||
|
using System.ComponentModel;
|
||||||
|
using System.Threading.Tasks;
|
||||||
|
|
||||||
|
namespace GitHub.Services.Common
|
||||||
|
{
|
||||||
|
[EditorBrowsable(EditorBrowsableState.Never)]
|
||||||
|
|
||||||
|
public static class RetriesHelper<T>
|
||||||
|
{
|
||||||
|
public static async Task<T> RetryWithTimeoutAsync(
|
||||||
|
Func<Task<T>> retriableAction,
|
||||||
|
TimeSpan minBackoff,
|
||||||
|
TimeSpan maxBackoff,
|
||||||
|
int maxTimeoutMinutes = 5
|
||||||
|
)
|
||||||
|
{
|
||||||
|
var remainingTime = TimeSpan.FromMinutes(maxTimeoutMinutes);
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
return await retriableAction();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
if (remainingTime > TimeSpan.Zero)
|
||||||
|
{
|
||||||
|
var backOff = BackoffTimerHelper.GetRandomBackoff(minBackoff, maxBackoff);
|
||||||
|
remainingTime -= backOff;
|
||||||
|
await Task.Delay(backOff);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
throw;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user