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

Fix JobDispatcher crash during force cancellation. (#3118)

Browse Source
This commit is contained in:
Tingluo Huang
2024-01-30 15:24:22 -05:00
committed by GitHub
parent 7414e08fbd
commit 5268d74ade
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Runner.Listener/JobDispatcher.cs
View File

@@ -629,6 +629,20 @@ namespace GitHub.Runner.Listener
Trace.Info("worker process has been killed."); Trace.Info("worker process has been killed.");
} }
} }
catch (Exception ex)
{
// message send failed, this might indicate worker process is already exited or stuck.
Trace.Info($"Job cancel message sending for job {message.JobId} failed, kill running worker. {ex}");
workerProcessCancelTokenSource.Cancel();
try
{
await workerProcessTask;
}
catch (OperationCanceledException)
{
Trace.Info("worker process has been killed.");
}
}
// wait worker to exit // wait worker to exit
// if worker doesn't exit within timeout, then kill worker. // if worker doesn't exit within timeout, then kill worker.