diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-11 18:50:04 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-11 18:50:04 +0000 |
| commit | 8011be32849011148ff41c56297378a26be9250f (patch) | |
| tree | 79a8a6b8d6e42fdf731be2444230fac1b432f000 /runsc | |
| parent | 858e180272d709c91dabe23745a9b4d5bd537c31 (diff) | |
| parent | d3fa741fb539d16b271f1bed2bcd93e382b0b2e2 (diff) | |
Merge release-20200219.0-146-gd3fa741 (automated)
Diffstat (limited to 'runsc')
| -rw-r--r-- | runsc/sandbox/sandbox.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/runsc/sandbox/sandbox.go b/runsc/sandbox/sandbox.go index 192bde40c..6177d6aa7 100644 --- a/runsc/sandbox/sandbox.go +++ b/runsc/sandbox/sandbox.go @@ -444,6 +444,12 @@ func (s *Sandbox) createSandboxProcess(conf *boot.Config, args *Args, startSyncF nextFD++ } + // TODO(b/151157106): syscall tests fail by timeout if asyncpreemptoff + // isn't set. + if conf.Platform == "kvm" { + cmd.Env = append(cmd.Env, "GODEBUG=asyncpreemptoff=1") + } + // The current process' stdio must be passed to the application via the // --stdio-fds flag. The stdio of the sandbox process itself must not // be connected to the same FDs, otherwise we risk leaking sandbox |