diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2019-06-03 18:14:52 -0700 |
|---|---|---|
| committer | Shentubot <shentubot@google.com> | 2019-06-03 18:16:09 -0700 |
| commit | d28f71adcf60793a81490f3b4d25da36901e769e (patch) | |
| tree | caef4a63a63fb4779be35ffc422825055b641826 /runsc/cmd/wait.go | |
| parent | 18e6e63503251cdc0b9432765b6eaa9ffa002824 (diff) | |
Remove 'clearStatus' option from container.Wait*PID()
clearStatus was added to allow detached execution to wait
on the exec'd process and retrieve its exit status. However,
it's not currently used. Both docker and gvisor-containerd-shim
wait on the "shim" process and retrieve the exit status from
there. We could change gvisor-containerd-shim to use waits, but
it will end up also consuming a process for the wait, which is
similar to having the shim process.
Closes #234
PiperOrigin-RevId: 251349490
Diffstat (limited to 'runsc/cmd/wait.go')
| -rw-r--r-- | runsc/cmd/wait.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runsc/cmd/wait.go b/runsc/cmd/wait.go index a55a682f3..58fd01974 100644 --- a/runsc/cmd/wait.go +++ b/runsc/cmd/wait.go @@ -88,14 +88,14 @@ func (wt *Wait) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) waitStatus = ws // Wait on a PID in the root PID namespace. case wt.rootPID != unsetPID: - ws, err := c.WaitRootPID(int32(wt.rootPID), true /* clearStatus */) + ws, err := c.WaitRootPID(int32(wt.rootPID)) if err != nil { Fatalf("waiting on PID in root PID namespace %d in container %q: %v", wt.rootPID, c.ID, err) } waitStatus = ws // Wait on a PID in the container's PID namespace. case wt.pid != unsetPID: - ws, err := c.WaitPID(int32(wt.pid), true /* clearStatus */) + ws, err := c.WaitPID(int32(wt.pid)) if err != nil { Fatalf("waiting on PID %d in container %q: %v", wt.pid, c.ID, err) } |