From d6225894afda19f11514200cfe67a9867b85a61a Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Wed, 14 Dec 2016 16:54:17 -0500
Subject: [PATCH] Clear index entries when removing pods or ctrs

When removing a pod sandbox or container, remove the ID of the item from
the corresponding ID index, so that we can correctly determine if it was
us or another actor that cleaned them up.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
---
 server/sandbox_remove.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/server/sandbox_remove.go b/server/sandbox_remove.go
index 9064b716..00f8c3b8 100644
--- a/server/sandbox_remove.go
+++ b/server/sandbox_remove.go
@@ -60,6 +60,9 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
 
 		s.releaseContainerName(c.Name())
 		s.removeContainer(c)
+		if err := s.ctrIDIndex.Delete(c.ID()); err != nil {
+			return nil, fmt.Errorf("failed to delete container %s in pod sandbox %s from index: %v", c.Name(), sb.id, err)
+		}
 	}
 
 	if err := label.UnreserveLabel(sb.processLabel); err != nil {
@@ -85,9 +88,15 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
 	s.releaseContainerName(podInfraContainer.Name())
 	s.removeContainer(podInfraContainer)
 	sb.infraContainer = nil
+	if err := s.ctrIDIndex.Delete(podInfraContainer.ID()); err != nil {
+		return nil, fmt.Errorf("failed to delete infra container %s in pod sandbox %s from index: %v", podInfraContainer.ID(), sb.id, err)
+	}
 
 	s.releasePodName(sb.name)
 	s.removeSandbox(sb.id)
+	if err := s.podIDIndex.Delete(sb.id); err != nil {
+		return nil, fmt.Errorf("failed to pod sandbox %s from index: %v", sb.id, err)
+	}
 
 	resp := &pb.RemovePodSandboxResponse{}
 	logrus.Debugf("RemovePodSandboxResponse %+v", resp)