From a4c63ec012ed30614b29b85cce6421aa0ea77e41 Mon Sep 17 00:00:00 2001 From: eric sciple Date: Tue, 11 Jun 2024 12:48:51 -0700 Subject: [PATCH] . --- src/Runner.Listener/MessageListener.cs | 10 +++++++++- src/Sdk/WebApi/WebApi/BrokerHttpClient.cs | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Runner.Listener/MessageListener.cs b/src/Runner.Listener/MessageListener.cs index 7b51423e6..3ffb9627e 100644 --- a/src/Runner.Listener/MessageListener.cs +++ b/src/Runner.Listener/MessageListener.cs @@ -398,7 +398,15 @@ namespace GitHub.Runner.Listener { using (var cs = new CancellationTokenSource(TimeSpan.FromSeconds(30))) { - await _runnerServer.DeleteAgentMessageAsync(_settings.PoolId, message.MessageId, _session.SessionId, cs.Token); + if (MessageUtil.IsRunServiceJob(message.MessageType)) + { + var messageRef = StringUtil.ConvertFromJson(message.Body); + await _brokerServer.DeleteRunnerMessageAsync(_session.SessionId, messageRef.RunnerRequestId, cs.Token); + } + else + { + await _runnerServer.DeleteAgentMessageAsync(_settings.PoolId, message.MessageId, _session.SessionId, cs.Token); + } } } } diff --git a/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs b/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs index 8f4e810d1..3c4a83afe 100644 --- a/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs +++ b/src/Sdk/WebApi/WebApi/BrokerHttpClient.cs @@ -141,6 +141,8 @@ namespace GitHub.Actions.RunService.WebApi queryParams.Add("jobMessageKey", jobMessageKey); } + queryParams.Add("status", TaskAgentStatus.Online.ToString()); + var result = await SendAsync( new HttpMethod("DELETE"), requestUri: requestUri,