From 073d7841b48840ede4c9b59e025e313c3b5c9250 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 28 Mar 2016 17:33:09 -0700 Subject: [PATCH] Use separate exec-root for test daemons Fixes #21545 Signed-off-by: Tonis Tiigi (cherry picked from commit 0d9b94c4c5d6b4f03a7a86e731e4110e9f27a51e) --- integration-cli/daemon.go | 1 + libcontainerd/remote_linux.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/integration-cli/daemon.go b/integration-cli/daemon.go index 7c2ab34be5..2e3985af7e 100644 --- a/integration-cli/daemon.go +++ b/integration-cli/daemon.go @@ -144,6 +144,7 @@ func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error { d.Command, "--containerd", "/var/run/docker/libcontainerd/docker-containerd.sock", "--graph", d.root, + "--exec-root", filepath.Join(d.folder, "exec-root"), "--pidfile", fmt.Sprintf("%s/docker.pid", d.folder), fmt.Sprintf("--userland-proxy=%t", d.userlandProxy), ) diff --git a/libcontainerd/remote_linux.go b/libcontainerd/remote_linux.go index f0284ca5ca..eddcc7fba3 100644 --- a/libcontainerd/remote_linux.go +++ b/libcontainerd/remote_linux.go @@ -210,7 +210,7 @@ func (r *remote) getLastEventTimestamp() int64 { t := time.Now() fi, err := os.Stat(r.eventTsPath) - if os.IsNotExist(err) { + if os.IsNotExist(err) || fi.Size() == 0 { return t.Unix() }