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

Merge pull request #84 from mrunalp/pod_attempt

Browse source 
Include attempt in the pod name
This commit is contained in:
Antonio Murdaca 2016-10-01 01:06:00 +02:00 • committed by GitHub
commit 3697a61db9
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/sandbox.go
View file

@ -41,7 +41,7 @@ func (s *sandbox) removeContainer(c *oci.Container) {
s.containers.Delete(c.Name()) s.containers.Delete(c.Name())
} }
func (s *Server) generatePodIDandName(name, namespace string) (string, string, error) { func (s *Server) generatePodIDandName(name string, namespace string, attempt uint32) (string, string, error) {
var ( var (
err error err error
id = stringid.GenerateNonCryptoID() id = stringid.GenerateNonCryptoID()
@ -49,7 +49,8 @@ func (s *Server) generatePodIDandName(name, namespace string) (string, string, e
if namespace == "" { if namespace == "" {
namespace = podDefaultNamespace namespace = podDefaultNamespace
} }
if name, err = s.reservePodName(id, namespace+"-"+name); err != nil {
if name, err = s.reservePodName(id, fmt.Sprintf("%s-%s-%v", namespace, name, attempt)); err != nil {
return "", "", err return "", "", err
} }
return id, name, err return id, name, err
@ -64,9 +65,10 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
} }
namespace := req.GetConfig().GetMetadata().GetNamespace() namespace := req.GetConfig().GetMetadata().GetNamespace()
attempt := req.GetConfig().GetMetadata().GetAttempt()
var err error var err error
id, name, err := s.generatePodIDandName(name, namespace) id, name, err := s.generatePodIDandName(name, namespace, attempt)
if err != nil { if err != nil {
return nil, err return nil, err
} }