Modify the default timeouts for process SafeKill. Change defaults for InMemoryProcess construction for fast exits.

Author: brdeyo

VERSION

@@ -1 +1 @@
-2.1.22
+2.1.23

src/VirtualClient/VirtualClient.Common/ProcessExtensions.cs

@@ -139,20 +139,5 @@ public static Task<IProcessProxy> WaitForResponseAsync(
 
             return process.WaitForResponseAsync(new Regex(response, comparisonOptions), cancellationToken, timeout);
         }
-
-        private static T SafeGet<T>(Func<T> propertyAccessor)
-            where T : IConvertible
-        {
-            T propertyValue = default(T);
-            try
-            {
-                propertyValue = propertyAccessor.Invoke();
-            }
-            catch
-            {
-            }
-
-            return propertyValue;
-        }
     }
 }

src/VirtualClient/VirtualClient.Core/ProcessExtensions.cs

@@ -93,50 +93,36 @@ public static bool IsErrored(this IProcessProxy process, IEnumerable<int> succes
         /// </summary>
         /// <param name="process">The process to kill.</param>
         /// <param name="logger">The logger to use to write trace information.</param>
-        /// <param name="timeout">Max duration to wait for exit, default to 3 minutes.</param>
-        public static void SafeKill(this IProcessProxy process, ILogger logger = null, TimeSpan timeout = default)
+        /// <param name="confirmationWaitTime">Max duration to wait for exit. Default = 10 seconds. Use TimeSpan.Zero for no wait.</param>
+        public static void SafeKill(this IProcessProxy process, ILogger logger = null, TimeSpan? confirmationWaitTime = null)
         {
-            TimeSpan effectiveTimeout = timeout == default ? TimeSpan.FromMinutes(3) : timeout;
-            DateTime exitTime = DateTime.UtcNow.Add(effectiveTimeout);
-            List<Exception> errors = new List<Exception>();
+            TimeSpan effectiveTimeout = confirmationWaitTime ?? TimeSpan.FromSeconds(10);
 
-            using (CancellationTokenSource tokenSource = new CancellationTokenSource(effectiveTimeout))
+            if (!process.HasExited)
             {
-                while (DateTime.UtcNow < exitTime)
+                // Process confirmed exited
+                try
                 {
-                    if (process.HasExited)
-                    {
-                        // Process confirmed exited
-                        break;
-                    }
+                    process.Kill(true);
 
-                    try
-                    {
-                        process.Kill(true);
-                        process.WaitForExitAsync(tokenSource.Token).GetAwaiter().GetResult();
-                    }
-                    catch (Exception exc)
+                    if (confirmationWaitTime != TimeSpan.Zero)
                     {
-                        errors.Add(exc);
+                        process.WaitForExitAsync(CancellationToken.None, confirmationWaitTime).GetAwaiter().GetResult();
                     }
                 }
-            }
-
-            if (!process.HasExited)
-            {
-                string processName = SafeGet<string>(() => process.Name);
-                int processId = SafeGet<int>(() => process.Id);
-
-                EventContext errorContext = EventContext.Persisted();
-                errorContext.AddProcessDetails(process.ToProcessDetails(process.Name));
-                if (errors.Any())
+                catch (Exception exc)
                 {
-                    errorContext.AddError(new AggregateException(
+                    string processName = SafeGet<string>(() => process.Name);
+                    int processId = SafeGet<int>(() => process.Id);
+
+                    EventContext errorContext = EventContext.Persisted();
+                    errorContext.AddProcessDetails(process.ToProcessDetails(process.Name));
+                    errorContext.AddError(new WorkloadException(
                         $"Process kill attempt failed (id={processId}, name={processName}, timeout={effectiveTimeout}).",
-                        errors));
-                }
+                        exc));
 
-                logger?.LogMessage($"ProcessKillFailed.{processName}", LogLevel.Warning, errorContext);
+                    logger?.LogMessage($"ProcessKillFailed.{processName}", LogLevel.Warning, errorContext);
+                }
             }
         }
 
@@ -181,11 +167,11 @@ public static void SafeKill(this ProcessManager processManager, IEnumerable<stri
         /// </summary>
         /// <param name="processManager">Provides functionality for creating processes.</param>
         /// <param name="process">The process to kill.</param>
-        /// <param name="timeout">Max duration to wait for exit, default to 3 minutes.</param>
         /// <param name="logger">The logger to use to write trace information.</param>
-        public static void SafeKill(this ProcessManager processManager, IProcessProxy process, ILogger logger = null, TimeSpan timeout = default)
+        /// <param name="confirmationWaitTime">Max duration to wait for exit. Default = 10 seconds. Use TimeSpan.Zero for no wait.</param>
+        public static void SafeKill(this ProcessManager processManager, IProcessProxy process, ILogger logger = null, TimeSpan? confirmationWaitTime = null)
         {
-            TimeSpan effectiveTimeout = timeout == default ? TimeSpan.FromMinutes(3) : timeout;
+            TimeSpan effectiveTimeout = confirmationWaitTime ?? TimeSpan.FromSeconds(10);
 
             using (CancellationTokenSource tokenSource = new CancellationTokenSource(effectiveTimeout))
             {
@@ -201,7 +187,7 @@ public static void SafeKill(this ProcessManager processManager, IProcessProxy pr
                     {
                         using (IProcessProxy kill = processManager.CreateProcess("kill", $"-9 {processId}"))
                         {
-                            kill.StartAndWaitAsync(tokenSource.Token, timeout)
+                            kill.StartAndWaitAsync(tokenSource.Token, confirmationWaitTime)
                                 .GetAwaiter().GetResult();
 
                             // 0 = Success
@@ -219,7 +205,7 @@ public static void SafeKill(this ProcessManager processManager, IProcessProxy pr
                     {
                         using (IProcessProxy taskkill = processManager.CreateProcess("taskkill", $"/F /PID {processId}"))
                         {
-                            taskkill.StartAndWaitAsync(tokenSource.Token, timeout)
+                            taskkill.StartAndWaitAsync(tokenSource.Token, confirmationWaitTime)
                                 .GetAwaiter().GetResult();
 
                             // 0 = Success

src/VirtualClient/VirtualClient.TestFramework/InMemoryProcess.cs

@@ -35,6 +35,7 @@ public InMemoryProcess()
         /// </summary>
         public InMemoryProcess(Stream standardInput)
         {
+            this.ExitCode = 0;
             this.StandardError = new ConcurrentBuffer();
             this.StandardOutput = new ConcurrentBuffer();
             this.StandardInput = new StreamWriter(standardInput);
@@ -45,6 +46,8 @@ public InMemoryProcess(Stream standardInput)
             };
             this.processDetails = new ProcessDetails();
             this.processDetails.Results = new List<string>();
+
+            this.OnHasExited = () => true;
         }
 
         /// <summary>