Consolidate error handling in Runtime.removeContainer

Use a helper to handle the cleanupErr logic instead of
copy&pasting it EIGHT times.

Also modifies the returned errors to be wrapped with a context,
and changes the text of the logged errors a bit.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>

libpod/runtime_ctr.go

@@ -766,12 +766,20 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
 	}
 
 	var cleanupErr error
+	reportErrorf := func(msg string, args ...any) {
+		err := fmt.Errorf(msg, args...) // Always use fmt.Errorf instead of just logrus.Errorf(…) because the format string probably contains %w
+		if cleanupErr == nil {
+			cleanupErr = err
+		} else {
+			logrus.Errorf("%s", err.Error())
+		}
+	}
 
 	// Clean up network namespace, cgroups, mounts.
 	// Do this before we set ContainerStateRemoving, to ensure that we can
 	// actually remove from the OCI runtime.
 	if err := c.cleanup(ctx); err != nil {
-		cleanupErr = fmt.Errorf("cleaning up container %s: %w", c.ID(), err)
+		reportErrorf("cleaning up container %s: %w", c.ID(), err)
 	}
 
 	// Remove all active exec sessions
@@ -779,11 +787,7 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
 	// after setting the state to ContainerStateRemoving will prevent that the container is
 	// restarted
 	if err := c.removeAllExecSessions(); err != nil {
-		if cleanupErr == nil {
+		reportErrorf("removing exec sessions: %w", err)
-			cleanupErr = err
-		} else {
-			logrus.Errorf("Remove exec sessions: %v", err)
-		}
 	}
 
 	// Set ContainerStateRemoving as an intermediate state (we may get
@@ -792,31 +796,19 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
 
 	if err := c.save(); err != nil {
 		if !errors.Is(err, define.ErrCtrRemoved) {
-			if cleanupErr == nil {
+			reportErrorf("saving container: %w", err)
-				cleanupErr = err
-			} else {
-				logrus.Errorf("Saving container: %v", err)
-			}
 		}
 	}
 
 	// Stop the container's storage
 	if err := c.teardownStorage(); err != nil {
-		if cleanupErr == nil {
+		reportErrorf("cleaning up storage: %w", err)
-			cleanupErr = err
-		} else {
-			logrus.Errorf("Cleaning up storage: %v", err)
-		}
 	}
 
 	// Remove the container's CID file on container removal.
 	if cidFile, ok := c.config.Spec.Annotations[define.InspectAnnotationCIDFile]; ok {
 		if err := os.Remove(cidFile); err != nil && !errors.Is(err, os.ErrNotExist) {
-			if cleanupErr == nil {
+			reportErrorf("cleaning up CID file: %w", err)
-				cleanupErr = err
-			} else {
-				logrus.Errorf("Cleaning up CID file: %v", err)
-			}
 		}
 	}
 	// Remove the container from the state
@@ -824,29 +816,17 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force, remo
 		// If we're removing the pod, the container will be evicted
 		// from the state elsewhere
 		if err := r.state.RemoveContainerFromPod(pod, c); err != nil {
-			if cleanupErr == nil {
+			reportErrorf("removing container %s from database: %w", c.ID(), err)
-				cleanupErr = err
-			} else {
-				logrus.Errorf("Removing container %s from database: %v", c.ID(), err)
-			}
 		}
 	} else {
 		if err := r.state.RemoveContainer(c); err != nil {
-			if cleanupErr == nil {
+			reportErrorf("removing container %s from database: %w", c.ID(), err)
-				cleanupErr = err
-			} else {
-				logrus.Errorf("Removing container %s from database: %v", c.ID(), err)
-			}
 		}
 	}
 
 	// Deallocate the container's lock
 	if err := c.lock.Free(); err != nil {
-		if cleanupErr == nil && !os.IsNotExist(err) {
+		reportErrorf("freeing lock for container %s: %w", c.ID(), err)
-			cleanupErr = fmt.Errorf("freeing lock for container %s: %w", c.ID(), err)
-		} else {
-			logrus.Errorf("Free container lock: %v", err)
-		}
 	}
 
 	// Set container as invalid so it can no longer be used