Merge pull request #14741 from giuseppe/pod-ps-no-race

pod: ps does not race with rm

2 files changed, 69 insertions, 43 deletions

diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
index 3e9cb7f5e..1dca8c580 100644
--- a/pkg/domain/infra/abi/pods.go
+++ b/pkg/domain/infra/abi/pods.go
@@ -402,6 +402,56 @@ func (ic *ContainerEngine) PodTop(ctx context.Context, options entities.PodTopOp
 	return report, err
 }
 
+func (ic *ContainerEngine) listPodReportFromPod(p *libpod.Pod) (*entities.ListPodsReport, error) {
+	status, err := p.GetPodStatus()
+	if err != nil {
+		return nil, err
+	}
+	cons, err := p.AllContainers()
+	if err != nil {
+		return nil, err
+	}
+	lpcs := make([]*entities.ListPodContainer, len(cons))
+	for i, c := range cons {
+		state, err := c.State()
+		if err != nil {
+			return nil, err
+		}
+		lpcs[i] = &entities.ListPodContainer{
+			Id:     c.ID(),
+			Names:  c.Name(),
+			Status: state.String(),
+		}
+	}
+	infraID, err := p.InfraContainerID()
+	if err != nil {
+		return nil, err
+	}
+	networks := []string{}
+	if len(infraID) > 0 {
+		infra, err := p.InfraContainer()
+		if err != nil {
+			return nil, err
+		}
+		networks, err = infra.Networks()
+		if err != nil {
+			return nil, err
+		}
+	}
+	return &entities.ListPodsReport{
+		Cgroup:     p.CgroupParent(),
+		Containers: lpcs,
+		Created:    p.CreatedTime(),
+		Id:         p.ID(),
+		InfraId:    infraID,
+		Name:       p.Name(),
+		Namespace:  p.Namespace(),
+		Networks:   networks,
+		Status:     status,
+		Labels:     p.Labels(),
+	}, nil
+}
+
 func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOptions) ([]*entities.ListPodsReport, error) {
 	var (
 		err error
@@ -431,53 +481,14 @@ func (ic *ContainerEngine) PodPs(ctx context.Context, options entities.PodPSOpti
 
 	reports := make([]*entities.ListPodsReport, 0, len(pds))
 	for _, p := range pds {
-		var lpcs []*entities.ListPodContainer
-		status, err := p.GetPodStatus()
-		if err != nil {
-			return nil, err
-		}
-		cons, err := p.AllContainers()
+		r, err := ic.listPodReportFromPod(p)
 		if err != nil {
-			return nil, err
-		}
-		for _, c := range cons {
-			state, err := c.State()
-			if err != nil {
-				return nil, err
+			if errors.Is(err, define.ErrNoSuchPod) || errors.Is(err, define.ErrNoSuchCtr) {
+				continue
 			}
-			lpcs = append(lpcs, &entities.ListPodContainer{
-				Id:     c.ID(),
-				Names:  c.Name(),
-				Status: state.String(),
-			})
-		}
-		infraID, err := p.InfraContainerID()
-		if err != nil {
 			return nil, err
 		}
-		networks := []string{}
-		if len(infraID) > 0 {
-			infra, err := p.InfraContainer()
-			if err != nil {
-				return nil, err
-			}
-			networks, err = infra.Networks()
-			if err != nil {
-				return nil, err
-			}
-		}
-		reports = append(reports, &entities.ListPodsReport{
-			Cgroup:     p.CgroupParent(),
-			Containers: lpcs,
-			Created:    p.CreatedTime(),
-			Id:         p.ID(),
-			InfraId:    infraID,
-			Name:       p.Name(),
-			Namespace:  p.Namespace(),
-			Networks:   networks,
-			Status:     status,
-			Labels:     p.Labels(),
-		})
+		reports = append(reports, r)
 	}
 	return reports, nil
 }
diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats
index f597c0e0a..92d3966be 100644
--- a/test/system/200-pod.bats
+++ b/test/system/200-pod.bats
@@ -495,7 +495,22 @@ spec:
     local actual2=$(< /sys/fs/cgroup/$path2/cpu.max)
     is "$actual2" "500000 100000" "resource limits set properly"
     run_podman --cgroup-manager=cgroupfs pod rm $name2
+}
+
+@test "podman pod ps doesn't race with pod rm" {
+    # create a few pods
+    for i in {0..10}; do
+        run_podman pod create
+    done
+
+    # and delete them
+    $PODMAN pod rm -a &
+
+    # pod ps should not fail while pods are deleted
+    run_podman pod ps -q
 
+    # wait for pod rm -a
+    wait
 }
 
 # vim: filetype=sh