From 1d00acee19f88406073cf1207f3944b3ad3046c3 Mon Sep 17 00:00:00 2001
From: Tyler Ramer <tyaramer@gmail.com>
Date: Fri, 25 Oct 2019 13:59:43 -0400
Subject: [PATCH] Log warn instead of error for removing nonexistant container
In event of a container removal that is no longer in database, log a
warning instead of an error, as there is not any problem continuing
execution.
Resolves #4314
Signed-off-by: Tyler Ramer <tyaramer@gmail.com>
---
pkg/adapter/containers.go | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index bff93cc9e2..73e6dba3a9 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -438,7 +438,11 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode
if c.IsSet("rm") {
if err := r.Runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
- logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
+ if errors.Cause(err) == define.ErrNoSuchCtr {
+ logrus.Warnf("Container %s does not exist: %v", ctr.ID(), err)
+ } else {
+ logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
+ }
}
}