summaryrefslogtreecommitdiffhomepage
path: root/runsc/container
diff options
context:
space:
mode:
authorFabricio Voznika <fvoznika@google.com>2018-06-04 12:13:33 -0700
committerShentubot <shentubot@google.com>2018-06-04 12:14:23 -0700
commit78ccd1298e1386d9c5e0eb10d328ecb16b28ea02 (patch)
tree872979aaaa07f8702eaacafeb897541878d5fc36 /runsc/container
parent55a37ceef1e33cc72236db6e95f159963ddf40bd (diff)
Return 'running' if gofer is still alive
Containerd will start deleting container and rootfs after container is stopped. However, if gofer is still running, rootfs cleanup will fail because of device busy. This CL makes sure that gofer is not running when container state is stopped. Change from: lantaol@google.com PiperOrigin-RevId: 199172668 Change-Id: I9d874eec3ecf74fd9c8edd7f62d9f998edef66fe
Diffstat (limited to 'runsc/container')
-rw-r--r--runsc/container/container_test.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/runsc/container/container_test.go b/runsc/container/container_test.go
index 0844cb9df..3af8d620c 100644
--- a/runsc/container/container_test.go
+++ b/runsc/container/container_test.go
@@ -186,6 +186,8 @@ func TestLifecycle(t *testing.T) {
// ourselves.
p, _ := os.FindProcess(s.Sandbox.Pid)
p.Wait()
+ g, _ := os.FindProcess(s.Sandbox.GoferPid)
+ g.Wait()
// Load the container from disk and check the status.
s, err = container.Load(rootDir, id)