diff options
| author | Nicolas Lacasse <nlacasse@google.com> | 2018-10-16 20:33:20 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2018-10-16 20:34:10 -0700 |
| commit | cea51641d4dacf24cc53a30144fc14ec053f5aa2 (patch) | |
| tree | a80566531a8b160007a303e92abafbe80112ac9e /runsc/container | |
| parent | 324ad3564ba42a5106be77a06d0cd52290e1cd22 (diff) | |
Bump sandbox start and stop timeouts.
PiperOrigin-RevId: 217433699
Change-Id: Icef08285728c23ee7dd650706aaf18da51c25dff
Diffstat (limited to 'runsc/container')
| -rw-r--r-- | runsc/container/BUILD | 2 | ||||
| -rw-r--r-- | runsc/container/container.go | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/runsc/container/BUILD b/runsc/container/BUILD index bf8b9a2ab..60f1d3033 100644 --- a/runsc/container/BUILD +++ b/runsc/container/BUILD @@ -40,8 +40,6 @@ go_test( ], embed = [":container"], tags = [ - # FIXME - "flaky", "requires-kvm", ], deps = [ diff --git a/runsc/container/container.go b/runsc/container/container.go index 37e607bed..774cb6e07 100644 --- a/runsc/container/container.go +++ b/runsc/container/container.go @@ -658,7 +658,7 @@ func (c *Container) stop() error { } func (c *Container) waitForStopped() error { - ctx, cancel := context.WithTimeout(context.Background(), 1*time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second) defer cancel() b := backoff.WithContext(backoff.NewConstantBackOff(100*time.Millisecond), ctx) op := func() error { |