summaryrefslogtreecommitdiff
path: root/daemon
diff options
context:
space:
mode:
authorShishir Mahajan <shishir.mahajan@redhat.com>2016-04-04 16:04:32 -0400
committerTibor Vass <tibor@docker.com>2016-04-06 18:15:51 -0400
commit5d1b0aecd0a52fb3ef3ebb298c6a335ff8ca95a9 (patch)
tree0738e5d1622cb925ea48674d347be8cfb23203c2 /daemon
parentf685fe1a9988af8a49225a6e574c231e2a19dc25 (diff)
downloaddocker-5d1b0aecd0a52fb3ef3ebb298c6a335ff8ca95a9.tar.gz
Ignore os.IsNotExist errors when calling ToDiskLocking
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com> (cherry picked from commit 606cf5310d20518b4a9dfbe4d8e6b872f8683d9e)
Diffstat (limited to 'daemon')
-rw-r--r--daemon/delete.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/delete.go b/daemon/delete.go
index 008eefaa88..9539e816c7 100644
--- a/daemon/delete.go
+++ b/daemon/delete.go
@@ -102,7 +102,7 @@ func (daemon *Daemon) cleanupContainer(container *container.Container, forceRemo
// Save container state to disk. So that if error happens before
// container meta file got removed from disk, then a restart of
// docker should not make a dead container alive.
- if err := container.ToDiskLocking(); err != nil {
+ if err := container.ToDiskLocking(); err != nil && !os.IsNotExist(err) {
logrus.Errorf("Error saving dying container to disk: %v", err)
}