Merge pull request #1477 from saschagrunert/port-forward-timeout

Increase port-forward timeout to 1s to fix e2e test
containerd · May 12, 2020 · 64aa9da · 64aa9da
2 parents 8c366df + e2cedb9
commit 64aa9da
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/server/sandbox_portforward_unix.go b/pkg/server/sandbox_portforward_unix.go
@@ -100,9 +100,9 @@ func (c *criService) portForward(ctx context.Context, id string, port int32, str
 			return ctx.Err()
 		}
 		// give a chance to terminate gracefully or timeout
-		// 0.5s is the default timeout used in socat
+		// after 1s
 		// https://linux.die.net/man/1/socat
-		timeout := time.Duration(500) * time.Millisecond
+		const timeout = time.Second
 		select {
 		case e := <-errCh:
 			if errFwd == nil {