diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-04-01 18:10:32 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-04-01 18:10:32 +0000 |
| commit | 7aaca21b706bb79c1bc5eee986009b8fae2af7cf (patch) | |
| tree | a3df1462b55a851ff7f2efe3b2555fe8cd4c91bb /runsc | |
| parent | 7ac96cd64fb4f93f66bdbb70676e37e60bd8061e (diff) | |
| parent | 4e6a1a5adb5607423c180089d8b464ef7dfdd1ae (diff) | |
Merge release-20200323.0-49-g4e6a1a5 (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 6c15727fa..8de75ae57 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 |