summaryrefslogtreecommitdiffhomepage
path: root/runsc
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-04-01 11:05:05 -0700
committergVisor bot <gvisor-bot@google.com>2020-04-01 11:06:26 -0700
commit4e6a1a5adb5607423c180089d8b464ef7dfdd1ae (patch)
treeaac579d8395dd545fb647ca6e08ca8079262fcdc /runsc
parentdb7917556a7e4bd2cd6d183c68f04a4787dec493 (diff)
Automated rollback of changelist 303799678
PiperOrigin-RevId: 304221302
Diffstat (limited to 'runsc')
-rw-r--r--runsc/sandbox/sandbox.go6
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