diff --git a/patches/last_processed_commit.txt b/patches/last_processed_commit.txt index 7da421d3d85..081f1e7a653 100644 --- a/patches/last_processed_commit.txt +++ b/patches/last_processed_commit.txt @@ -1 +1 @@ -4197182ef8f39c719f66038c1bc9b34cd9e9ac9a +110142c2c501c6ae9373d553efa826bedbaab5f7 diff --git a/patches/runner-main-sdk8-arm.patch b/patches/runner-main-sdk8-arm.patch index 5b8577e1dd1..440492076dc 100644 --- a/patches/runner-main-sdk8-arm.patch +++ b/patches/runner-main-sdk8-arm.patch @@ -622,4 +622,4 @@ index 63e95af8..70cfe5c2 100644 + "version": "9.0.318" } } -# From upstream commit: 4197182ef8f39c719f66038c1bc9b34cd9e9ac9a +# From upstream commit: 110142c2c501c6ae9373d553efa826bedbaab5f7 diff --git a/patches/runner-main-sdk8-ppc64le.patch b/patches/runner-main-sdk8-ppc64le.patch index f77c631713d..55a8f75f2f7 100644 --- a/patches/runner-main-sdk8-ppc64le.patch +++ b/patches/runner-main-sdk8-ppc64le.patch @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644 -# From upstream commit: 4197182ef8f39c719f66038c1bc9b34cd9e9ac9a +# From upstream commit: 110142c2c501c6ae9373d553efa826bedbaab5f7 diff --git a/patches/runner-main-sdk8-s390x.patch b/patches/runner-main-sdk8-s390x.patch index f77c631713d..55a8f75f2f7 100644 --- a/patches/runner-main-sdk8-s390x.patch +++ b/patches/runner-main-sdk8-s390x.patch @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644 -# From upstream commit: 4197182ef8f39c719f66038c1bc9b34cd9e9ac9a +# From upstream commit: 110142c2c501c6ae9373d553efa826bedbaab5f7 diff --git a/src/Runner.Common/BrokerServer.cs b/src/Runner.Common/BrokerServer.cs index 8c5e96fc7c5..ced0693526c 100644 --- a/src/Runner.Common/BrokerServer.cs +++ b/src/Runner.Common/BrokerServer.cs @@ -98,9 +98,15 @@ public async Task RunLongPollWebSocketProbeAsync(Can while (!cancellationToken.IsCancellationRequested) { - var socket = await ConnectWebSocketAsync(cancellationToken); + var (socket, connectEx) = await ConnectWebSocketAsync(cancellationToken); if (socket == null) { + var errorMsg = connectEx.InnerException?.Message ?? connectEx.Message; + if (!result.Errors.Contains(errorMsg)) + { + result.Errors.Add(errorMsg); + } + result.ConnectFailures++; result.LastCloseReason = "connect_failed"; @@ -158,9 +164,10 @@ await socket.SendAsync( { Trace.Info("Exception caught while holding runner websocket, will reconnect."); Trace.Error(ex); - if (!result.Errors.Contains(ex.Message)) + var errorMsg = ex.InnerException?.Message ?? ex.Message; + if (!result.Errors.Contains(errorMsg)) { - result.Errors.Add(ex.Message); + result.Errors.Add(errorMsg); } result.LastCloseReason = "error"; } @@ -177,20 +184,20 @@ await socket.SendAsync( return result; } - private async Task ConnectWebSocketAsync(CancellationToken cancellationToken) + private async Task<(ClientWebSocket Socket, Exception Error)> ConnectWebSocketAsync(CancellationToken cancellationToken) { try { Trace.Info("Attempting to start runner websocket client."); var socket = await _brokerHttpClient.ConnectRunnerLongPollWebSocketAsync(cancellationToken); Trace.Info("Successfully started runner websocket client."); - return socket; + return (socket, null); } catch (Exception ex) { Trace.Info("Exception caught during runner websocket connect, will retry."); Trace.Error(ex); - return null; + return (null, ex); } }