vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #59 from mrunalp/pod_create_bug

Browse source 
Pod create bug
This commit is contained in:
Antonio Murdaca 2016-09-27 09:13:40 +02:00 • committed by GitHub
commit f7d3f7a69a
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/sandbox.go
View file

@ -312,6 +312,8 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
return nil, fmt.Errorf("failed to remove sandbox %s directory: %v", sandboxID, err) return nil, fmt.Errorf("failed to remove sandbox %s directory: %v", sandboxID, err)
} }
s.releasePodName(sb.name)
return &pb.RemovePodSandboxResponse{}, nil return &pb.RemovePodSandboxResponse{}, nil
} }

6
server/server.go
View file

@ -95,13 +95,17 @@ func (s *Server) reservePodName(id, name string) (string, error) {
logrus.Warnf("name %s already reserved for %s", name, id) logrus.Warnf("name %s already reserved for %s", name, id)
return "", err 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) return "", fmt.Errorf("error reserving name %s", name)
} }
return name, nil return name, nil
} }
func (s *Server) releasePodName(name string) {
s.podNameIndex.Release(name)
}
// New creates a new Server with options provided // New creates a new Server with options provided
func New(runtimePath, root, sandboxDir, containerDir string) (*Server, error) { func New(runtimePath, root, sandboxDir, containerDir string) (*Server, error) {
// TODO: This will go away later when we have wrapper process or systemd acting as // TODO: This will go away later when we have wrapper process or systemd acting as