summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libpod/boltdb_state.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index de6174c10..42f029379 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -705,7 +705,11 @@ func (s *BoltState) AllContainers() ([]*Container, error) {
// We just won't include the container in the
// results.
if errors.Cause(err) != ErrNSMismatch {
- return err
+ // Even if it's not an NS mismatch, it's
+ // not worth erroring over.
+ // If we do, a single bad container JSON
+ // could render libpod unusable.
+ logrus.Errorf("Error retrieving container %s from the database: %v", string(id), err)
}
} else {
ctrs = append(ctrs, ctr)
@@ -1655,7 +1659,7 @@ func (s *BoltState) AllPods() ([]*Pod, error) {
if err := s.getPodFromDB(id, pod, podBucket); err != nil {
if errors.Cause(err) != ErrNSMismatch {
- return err
+ logrus.Errorf("Error retrieving pod %s from the database: %v", string(id), err)
}
} else {
pods = append(pods, pod)