From df614a7fbfee21a5f7cb199c69268670c8c95acb Mon Sep 17 00:00:00 2001 From: Thomas Farr Date: Tue, 24 Dec 2024 12:41:01 +1300 Subject: [PATCH] Fix compiling Signed-off-by: Thomas Farr --- .../Tasks/IClusterComposeTask.cs | 6 ++++-- build/scripts/Tooling.fs | 15 +++++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs index 74441951ef..5395ca7171 100644 --- a/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs +++ b/abstractions/src/OpenSearch.OpenSearch.Ephemeral/Tasks/IClusterComposeTask.cs @@ -200,10 +200,12 @@ private static void ExecuteBinaryInternal(EphemeralClusterConfiguration config, var timeout = TimeSpan.FromSeconds(420); var processStartArguments = new StartArguments(binary, arguments) { - Environment = environment + Environment = environment, + Timeout = timeout, + ConsoleOutWriter = new ConsoleOutWriter() }; - var result = Proc.Start(processStartArguments, timeout, new ConsoleOutColorWriter()); + var result = Proc.Start(processStartArguments); if (!result.Completed) throw new Exception($"Timeout while executing {description} exceeded {timeout}"); diff --git a/build/scripts/Tooling.fs b/build/scripts/Tooling.fs index 91a011a9ba..623626abe8 100644 --- a/build/scripts/Tooling.fs +++ b/build/scripts/Tooling.fs @@ -44,11 +44,13 @@ module Tooling = let private defaultConsoleWriter = Some <| (ConsoleOutColorWriter() :> IConsoleOutWriter) - let readInWithTimeout timeout workinDir bin (writer: IConsoleOutWriter option) args = + let readInWithTimeout (timeout: TimeSpan) workinDir bin (writer: IConsoleOutWriter option) args = let startArgs = StartArguments(bin, args |> List.toArray) if (Option.isSome workinDir) then startArgs.WorkingDirectory <- Option.defaultValue "" workinDir - let result = Proc.Start(startArgs, timeout, Option.defaultValue (NoopWriter()) writer) + startArgs.Timeout <- timeout + startArgs.ConsoleOutWriter <- Option.defaultValue (NoopWriter()) writer + let result = Proc.Start(startArgs) if not result.Completed then failwithf "process failed to complete within %O: %s" timeout bin if not result.ExitCode.HasValue then failwithf "process yielded no exit code: %s" bin @@ -57,16 +59,17 @@ module Tooling = let read bin args = readInWithTimeout defaultTimeout None bin defaultConsoleWriter args let readQuiet bin args = readInWithTimeout defaultTimeout None bin None args - let execInWithTimeout timeout workinDir bin args = + let execInWithTimeout (timeout: TimeSpan) workinDir bin args = let startArgs = ExecArguments(bin, args |> List.toArray) if (Option.isSome workinDir) then startArgs.WorkingDirectory <- Option.defaultValue "" workinDir + startArgs.Timeout <- timeout let options = args |> String.concat " " printfn ":: Running command: %s %s" bin options - let result = Proc.Exec(startArgs, timeout) try - if not result.HasValue || result.Value > 0 then - failwithf "process returned %i: %s" result.Value bin + let result = Proc.Exec(startArgs) + if result > 0 then + failwithf "process returned %i: %s" result bin with | :? ProcExecException as ex -> failwithf "%s" ex.Message