From e1b8802848e60a6473b918eb64f25e9d8d907deb Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Mon, 26 Sep 2016 15:31:06 -0700 Subject: [PATCH 1/3] Fix typo --- server/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/server.go b/server/server.go index 5991646a..96b7dbed 100644 --- a/server/server.go +++ b/server/server.go @@ -95,7 +95,7 @@ func (s *Server) reservePodName(id, name string) (string, error) { logrus.Warnf("name %s already reserved for %s", name, id) return "", err } - return "", fmt.Errorf("conflict, name %s already reserver", name) + return "", fmt.Errorf("conflict, name %s already reserved", name) } return "", fmt.Errorf("error reserving name %s", name) } From 78aae688e2932f0cfc2a23e28ad30b58c6b8577f Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Mon, 26 Sep 2016 15:35:34 -0700 Subject: [PATCH 2/3] Add API to release Pod name when not required Signed-off-by: Mrunal Patel --- server/server.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/server.go b/server/server.go index 96b7dbed..0e7e9f09 100644 --- a/server/server.go +++ b/server/server.go @@ -102,6 +102,10 @@ func (s *Server) reservePodName(id, name string) (string, error) { return name, nil } +func (s *Server) releasePodName(name string) { + s.podNameIndex.Release(name) +} + // New creates a new Server with options provided func New(runtimePath, root, sandboxDir, containerDir string) (*Server, error) { // TODO: This will go away later when we have wrapper process or systemd acting as From 3245810bd62b7a9cb03b63e921ca9e605c559481 Mon Sep 17 00:00:00 2001 From: Mrunal Patel Date: Mon, 26 Sep 2016 15:42:08 -0700 Subject: [PATCH 3/3] Release pod name when pod is removed Signed-off-by: Mrunal Patel --- server/sandbox.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sandbox.go b/server/sandbox.go index 42dbdb46..2c0d3de0 100644 --- a/server/sandbox.go +++ b/server/sandbox.go @@ -300,6 +300,8 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR return nil, fmt.Errorf("failed to remove sandbox %s directory: %v", *sbID, err) } + s.releasePodName(sb.name) + return &pb.RemovePodSandboxResponse{}, nil }