From 678b554b1fe74bf636802632224c994b4768edc9 Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Tue, 28 Sep 2021 14:12:18 -0400
Subject: [PATCH] Ensure pod ID bucket is properly updated on rename

As we were not updating the pod ID bucket, removing a pod with
containers still in it (including the infra container, which will
always suffer from this) will not properly update the name
registry to remove the name of any renamed containers. This
patch ensures that does not happen - all containers will be fully
removed, even if renamed.

Fixes #11750

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 libpod/boltdb_state.go  | 17 +++++++++++++++++
 test/e2e/rename_test.go | 25 +++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index 612908ac26..1242a8d6ba 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -1756,6 +1756,23 @@ func (s *BoltState) SafeRewriteContainerConfig(ctr *Container, oldName, newName
 				if err := allCtrsBkt.Put([]byte(ctr.ID()), []byte(newName)); err != nil {
 					return errors.Wrapf(err, "error renaming container %s in all containers bucket in DB", ctr.ID())
 				}
+				if ctr.config.Pod != "" {
+					podsBkt, err := getPodBucket(tx)
+					if err != nil {
+						return err
+					}
+					podBkt := podsBkt.Bucket([]byte(ctr.config.Pod))
+					if podBkt == nil {
+						return errors.Wrapf(define.ErrInternal, "bucket for pod %s does not exist", ctr.config.Pod)
+					}
+					podCtrBkt := podBkt.Bucket(containersBkt)
+					if podCtrBkt == nil {
+						return errors.Wrapf(define.ErrInternal, "pod %s does not have a containers bucket", ctr.config.Pod)
+					}
+					if err := podCtrBkt.Put([]byte(ctr.ID()), []byte(newName)); err != nil {
+						return errors.Wrapf(err, "error renaming container %s in pod %s members bucket", ctr.ID(), ctr.config.Pod)
+					}
+				}
 			}
 		}
 
diff --git a/test/e2e/rename_test.go b/test/e2e/rename_test.go
index 0bd1792c96..e5e69c25c0 100644
--- a/test/e2e/rename_test.go
+++ b/test/e2e/rename_test.go
@@ -111,4 +111,29 @@ var _ = Describe("podman rename", func() {
 		Expect(ps).Should(Exit(0))
 		Expect(ps.OutputToString()).To(ContainSubstring(newName))
 	})
+
+	It("Rename a container that is part of a pod", func() {
+		podName := "testPod"
+		infraName := "infra1"
+		pod := podmanTest.Podman([]string{"pod", "create", "--name", podName, "--infra-name", infraName})
+		pod.WaitWithDefaultTimeout()
+		Expect(pod).Should(Exit(0))
+
+		infraName2 := "infra2"
+		rename := podmanTest.Podman([]string{"rename", infraName, infraName2})
+		rename.WaitWithDefaultTimeout()
+		Expect(rename).Should(Exit(0))
+
+		remove := podmanTest.Podman([]string{"pod", "rm", "-f", podName})
+		remove.WaitWithDefaultTimeout()
+		Expect(remove).Should(Exit(0))
+
+		create := podmanTest.Podman([]string{"create", "--name", infraName2, ALPINE, "top"})
+		create.WaitWithDefaultTimeout()
+		Expect(create).Should(Exit(0))
+
+		create2 := podmanTest.Podman([]string{"create", "--name", infraName, ALPINE, "top"})
+		create2.WaitWithDefaultTimeout()
+		Expect(create2).Should(Exit(0))
+	})
 })