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

Revert "Recreate VssConnection on retry (#1316)" (#1343)

Browse Source 
This reverts commit 4359dd605b.
This commit is contained in:
Julio Barba
2021-09-15 13:21:50 -04:00
committed by GitHub
parent 176e7f5208
commit 881c521005
3 changed files with 12 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,19 +2,16 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using GitHub.Runner.Sdk;
using GitHub.Services.WebApi;
using GitHub.Services.Common;
namespace GitHub.Runner.Common
{
[ServiceLocator(Default = typeof(JobServer))]
public interface IJobServer : IRunnerService
{
Task ConnectAsync(Uri jobServerUrl, VssCredentials jobServerCredential, DelegatingHandler[] delegatingHandler = null);
Task ConnectAsync(VssConnection jobConnection);
// logging and console
Task<TaskLog> AppendLogContentAsync(Guid scopeIdentifier, string hubName, Guid planId, int logId, Stream uploadStream, CancellationToken cancellationToken);
@@ -35,21 +32,20 @@ namespace GitHub.Runner.Common
private VssConnection _connection;
private TaskHttpClient _taskClient;
public async Task ConnectAsync(Uri jobServerUrl, VssCredentials jobServerCredential, DelegatingHandler[] delegatingHandler = null)
public async Task ConnectAsync(VssConnection jobConnection)
{
Trace.Info($"Establishing connection for JobServer");
_connection = jobConnection;
int attemptCount = 5;
while (attemptCount-- > 0)
while (!_connection.HasAuthenticated && attemptCount-- > 0)
{
try
{
await RefreshConnectionAsync(jobServerUrl, jobServerCredential, delegatingHandler);
await _connection.ConnectAsync();
break;
}
catch (Exception ex) when (attemptCount > 0)
{
Trace.Info($"Catch exception during connect. {attemptCount} attempts left.");
Trace.Info($"Catch exception during connect. {attemptCount} attemp left.");
Trace.Error(ex);
}
@@ -57,15 +53,6 @@ namespace GitHub.Runner.Common
}
_taskClient = _connection.GetClient<TaskHttpClient>();
}
private async Task RefreshConnectionAsync(Uri jobServerUrl, VssCredentials jobServerCredential, DelegatingHandler[] delegatingHandler)
{
Trace.Info($"Refresh JobServer VssConnection to get on a different AFD node.");
_hasConnection = false;
_connection?.Dispose();
_connection = VssUtil.CreateConnection(jobServerUrl, jobServerCredential, delegatingHandler);
await _connection.ConnectAsync();
_hasConnection = true;
}