github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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

Browse Source 
Increase port-forward timeout to 1s to fix e2e test
This commit is contained in:
Mike Brown 2020-05-12 07:59:14 -05:00 committed by GitHub
commit 64aa9da76f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/server/sandbox_portforward_unix.go
View File

@ -100,9 +100,9 @@ func (c *criService) portForward(ctx context.Context, id string, port int32, str
return ctx.Err() return ctx.Err()
} }
// give a chance to terminate gracefully or timeout // 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 // https://linux.die.net/man/1/socat
timeout := time.Duration(500) * time.Millisecond const timeout = time.Second
select { select {
case e := <-errCh: case e := <-errCh:
if errFwd == nil { if errFwd == nil {