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

enable #nullable in BrokerServer.cs and rename some methods

Browse Source
This commit is contained in:
Patrick Ellis
2024-01-04 21:21:16 +00:00
committed by GitHub
parent 31436b3c38
commit 40f813e0fb
4 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,12 @@
using System;
using System.Collections.Generic;
#nullable enable
using System;
using System.Threading;
using System.Threading.Tasks;
using GitHub.Actions.RunService.WebApi;
using GitHub.DistributedTask.Pipelines;
using GitHub.DistributedTask.WebApi;
using GitHub.Runner.Sdk;
using GitHub.Services.Common;
using Sdk.RSWebApi.Contracts;
using Sdk.WebApi.WebApi.RawClient;
namespace GitHub.Runner.Common
@@ -15,44 +14,33 @@ namespace GitHub.Runner.Common
[ServiceLocator(Default = typeof(BrokerServer))]
public interface IBrokerServer : IRunnerService
{
Task<BrokerSession> ConnectAsync(Uri serverUrl, VssCredentials credentials);
Task<BrokerSession> CreateSessionAsync(Uri serverUrl, VssCredentials credentials, CancellationToken token);
Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken token, TaskAgentStatus status, string version);
}
public sealed class BrokerServer : RunnerService, IBrokerServer
{
private bool _hasConnection;
private Uri _brokerUri;
private RawConnection _connection;
private BrokerHttpClient _brokerHttpClient;
private bool _hasSession;
private BrokerSession _session;
private RawConnection? _connection;
private BrokerHttpClient? _brokerHttpClient;
private BrokerSession? _session;
public async Task<BrokerSession> ConnectAsync(Uri serverUri, VssCredentials credentials)
public async Task<BrokerSession> CreateSessionAsync(Uri serverUri, VssCredentials credentials, CancellationToken cancellationToken)
{
_brokerUri = serverUri;
_connection = VssUtil.CreateRawConnection(serverUri, credentials);
_brokerHttpClient = await _connection.GetClientAsync<BrokerHttpClient>();
_session = await _brokerHttpClient.CreateSessionAsync();
_hasConnection = true;
_hasSession = true;
return _session;
}
private void CheckConnection()
{
if (!_hasConnection || !_hasSession)
{
throw new InvalidOperationException($"SetConnection");
}
_brokerHttpClient = await _connection.GetClientAsync<BrokerHttpClient>(cancellationToken);
return await RetryRequest(
async () => _session = await _brokerHttpClient.CreateSessionAsync(),
cancellationToken
);
}
public Task<TaskAgentMessage> GetRunnerMessageAsync(CancellationToken cancellationToken, TaskAgentStatus status, string version)
{
CheckConnection();
if (_connection is null || _session is null || _brokerHttpClient is null)
{
throw new InvalidOperationException($"SetConnection");
}
var jobMessage = RetryRequest<TaskAgentMessage>(
async () => await _brokerHttpClient.GetRunnerMessageAsync(_session.id, version, status, cancellationToken), cancellationToken);

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

@@ -1,10 +1,5 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using GitHub.DistributedTask.WebApi;
@@ -12,8 +7,6 @@ using GitHub.Runner.Common;
using GitHub.Runner.Listener.Configuration;
using GitHub.Runner.Sdk;
using GitHub.Services.Common;
using GitHub.Runner.Common.Util;
using GitHub.Services.OAuth;
namespace GitHub.Runner.Listener
{
@@ -38,7 +31,7 @@ namespace GitHub.Runner.Listener
public async Task<Boolean> CreateSessionAsync(CancellationToken token)
{
await RefreshBrokerConnection();
await RefreshBrokerSession(token);
return await Task.FromResult(true);
}
@@ -139,8 +132,8 @@ namespace GitHub.Runner.Listener
encounteringError = true;
}
// re-create VssConnection before next retry
await RefreshBrokerConnection();
// re-create session before next retry
await RefreshBrokerSession(token);
Trace.Info("Sleeping for {0} seconds before retrying.", _getNextMessageRetryInterval.TotalSeconds);
await HostContext.Delay(_getNextMessageRetryInterval, token);
@@ -193,7 +186,7 @@ namespace GitHub.Runner.Listener
}
}
private async Task RefreshBrokerConnection()
private async Task RefreshBrokerSession(CancellationToken ct)
{
var configManager = HostContext.GetService<IConfigurationManager>();
_settings = configManager.LoadSettings();
@@ -205,8 +198,8 @@ namespace GitHub.Runner.Listener
var credMgr = HostContext.GetService<ICredentialManager>();
VssCredentials creds = credMgr.LoadCredentials();
var sessionResponse = await _brokerServer.ConnectAsync(new Uri(_settings.ServerUrlV2), creds);
_sessionId = sessionResponse.id;
var session = await _brokerServer.CreateSessionAsync(new Uri(_settings.ServerUrlV2), creds, ct);
_sessionId = session.id;
}
}
}

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

@@ -78,6 +78,11 @@ namespace GitHub.Actions.RunService.WebApi
throw new AccessDeniedException(result.Error);
}
if (result.StatusCode == HttpStatusCode.Conflict)
{
throw new TaskAgentSessionConflictException(result.Error);
}
throw new Exception($"Failed to get job message: {result.Error}");
}
public async Task<TaskAgentMessage> GetRunnerMessageAsync(

22
src/Test/L0/Listener/BrokerMessageListenerL0.cs
View File

@@ -31,20 +31,32 @@ namespace GitHub.Runner.Common.Tests.Listener
[Fact]
[Trait("Level", "L0")]
[Trait("Category", "Runner")]
public async void CreatesSessionAsync()
public async void CreatesSession()
{
using TestHostContext tc = CreateTestContext();
using var tokenSource = new CancellationTokenSource();
// Arrange.
_brokerServer.Setup(x => x.ConnectAsync(new Uri(_settings.ServerUrlV2), It.Is<VssCredentials>(y => y != null))).Returns(Task.FromResult(new BrokerSession { id = "my-phony-session-id" }));
// Arrange
_brokerServer
.Setup(
x => x.CreateSessionAsync(
new Uri(_settings.ServerUrlV2),
It.Is<VssCredentials>(y => y != null),
tokenSource.Token
)
)
.Returns(
Task.FromResult(
new BrokerSession { id = "my-phony-session-id" }
)
);
BrokerMessageListener listener = new();
listener.Initialize(tc);
// Act.
// Act
bool result = await listener.CreateSessionAsync(tokenSource.Token);
// Assert.
// Assert
Assert.True(result);
Assert.Equal("my-phony-session-id", listener._sessionId);
}