summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-09-07 10:42:11 +0200
committerGitHub <noreply@github.com>2022-09-07 10:42:11 +0200
commit1da178a3e68de125b5ddc79e32410d58c1bf85f7 (patch)
tree1d50409a143e942ef05cc5a163c3169fd75c4e1a
parentb231e73c206dfcc576de83c83c65240259b6d119 (diff)
parente0d5b4e3fbeb5a5fdd353f55e0a3f39cf3901811 (diff)
downloadpodman-1da178a3e68de125b5ddc79e32410d58c1bf85f7.tar.gz
podman-1da178a3e68de125b5ddc79e32410d58c1bf85f7.tar.bz2
podman-1da178a3e68de125b5ddc79e32410d58c1bf85f7.zip
Merge pull request #15655 from n1hility/increase-pipe-wait
Fix intermittent issue with Compat API proxy startup on Windows
-rw-r--r--pkg/machine/wsl/machine.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/machine/wsl/machine.go b/pkg/machine/wsl/machine.go
index 81f1d187f..8b6d74817 100644
--- a/pkg/machine/wsl/machine.go
+++ b/pkg/machine/wsl/machine.go
@@ -1061,7 +1061,7 @@ func launchWinProxy(v *MachineVM) (bool, string, error) {
return globalName, "", err
}
- return globalName, pipePrefix + waitPipe, waitPipeExists(waitPipe, 30, func() error {
+ return globalName, pipePrefix + waitPipe, waitPipeExists(waitPipe, 80, func() error {
active, exitCode := machine.GetProcessState(cmd.Process.Pid)
if !active {
return fmt.Errorf("win-sshproxy.exe failed to start, exit code: %d (see windows event logs)", exitCode)
@@ -1099,7 +1099,7 @@ func waitPipeExists(pipeName string, retries int, checkFailure func() error) err
if fail := checkFailure(); fail != nil {
return fail
}
- time.Sleep(100 * time.Millisecond)
+ time.Sleep(250 * time.Millisecond)
}
return err