From 8a741dc87331a346d38123b886331b240c06c509 Mon Sep 17 00:00:00 2001 From: "Jack He (Github)" Date: Mon, 24 Jun 2024 10:29:59 -0700 Subject: [PATCH] Fix Linux XDP Merge Conflicts Properly (#4369) * proper fix merge conflicts * remove unreferenced sudo var --- scripts/secnetperf-helpers.psm1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/secnetperf-helpers.psm1 b/scripts/secnetperf-helpers.psm1 index 8729bac272..aa5e19d522 100644 --- a/scripts/secnetperf-helpers.psm1 +++ b/scripts/secnetperf-helpers.psm1 @@ -431,12 +431,12 @@ function Stop-RemoteServerAsyncAwait { } function Wait-StartRemoteServerPassive { - param ($FullPath, $RemoteName, $OutputDir) + param ($FullPath, $RemoteName, $OutputDir, $UseSudo) for ($i = 0; $i -lt 30; $i++) { Start-Sleep -Seconds 5 | Out-Null Write-Host "Attempt $i to start the remote server, command: $FullPath -target:$RemoteName" - $Process = Start-LocalTest $FullPath "-target:$RemoteName" $OutputDir + $Process = Start-LocalTest $FullPath "-target:$RemoteName" $OutputDir $UseSudo $ConsoleOutput = Wait-LocalTest $Process $OutputDir $false 30000 $true Write-Host "Wait-StartRemoteServerPassive: $ConsoleOutput" $DidMatch = $ConsoleOutput -match "Completed" # Look for the special string to indicate success. @@ -713,8 +713,8 @@ function Invoke-Secnetperf { $StateDir = "/etc/_state" } if ($Environment -eq "azure") { - Start-RemoteServerPassive $Session "$sudo$RemoteDir/$SecNetPerfPath $serverArgs" $StateDir $RunId $SyncerSecret - Wait-StartRemoteServerPassive "$sudo$clientPath" $RemoteName $artifactDir + Start-RemoteServerPassive $Session "$RemoteDir/$SecNetPerfPath $serverArgs" $StateDir $RunId $SyncerSecret + Wait-StartRemoteServerPassive "$clientPath" $RemoteName $artifactDir $useSudo } else { $job = Start-RemoteServer $Session "$RemoteDir/$SecNetPerfPath" $serverArgs $useSudo }