opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-09 14:56:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

When shutting down the runtime we should always close the database

Browse Source 
Even if the storage fails to shutdown. This patch fixes on TODO.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

Closes: #97
Approved by: mheon
This commit is contained in:
Daniel J Walsh
2017-12-03 08:25:16 -05:00
committed by Atomic Bot
parent 5c9694a0c1
commit 55c8b69d8f
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libpod/runtime.go
View File

@ -225,11 +225,16 @@ func (r *Runtime) Shutdown(force bool) error {
}
}
_, err := r.store.Shutdown(force)
if err != nil {
return err
var lastError error
if _, err := r.store.Shutdown(force); err != nil {
lastError = errors.Wrapf(err, "Error shutting down container storage")
}
if err := r.state.Close(); err != nil {
if lastError != nil {
logrus.Errorf("%v", lastError)
}
lastError = err
}
// TODO: Should always call this even if store.Shutdown failed
return r.state.Close()
return lastError
}