From cc9367a966455b19333b3553bbc1778200017252 Mon Sep 17 00:00:00 2001 From: Pratik Sanglikar Date: Mon, 26 Jul 2021 15:10:27 -0700 Subject: [PATCH] Add timeout for Process.WaitForExit() --- src/Microsoft.Tye.Core/ProcessUtil.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.Tye.Core/ProcessUtil.cs b/src/Microsoft.Tye.Core/ProcessUtil.cs index a2d65090..01270a45 100644 --- a/src/Microsoft.Tye.Core/ProcessUtil.cs +++ b/src/Microsoft.Tye.Core/ProcessUtil.cs @@ -23,6 +23,8 @@ namespace Microsoft.Tye private static readonly bool IsWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows); + private const int ProcessExitTimeoutMs = 60 * 1000; // 1 minute timeout for the process to exit. + public static Task ExecuteAsync( string command, string args, @@ -118,7 +120,12 @@ namespace Microsoft.Tye { // Even though the Exited event has been raised, WaitForExit() must still be called to ensure the output buffers // have been flushed before the process is considered completely done. - process.WaitForExit(); + // Because of the bug in the dotnet runtime https://github.com/dotnet/runtime/issues/29232, Process.WaitForExit() + // hangs for processes that spawn another long-running processes. + // Since these are expected to be long running processes and we're typically not concerned with capturing all of its output + // i.e. it's probably ok for some output to be lost on shutdown, since Tye is shutting down anyway, + // we call Process.WaitForProcessExit(ProcessExitTimeoutMs). + process.WaitForExit(ProcessExitTimeoutMs); } if (throwOnError && process.ExitCode != 0)