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

Include attempt in the pod name

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-09-30 15:23:38 -07:00
parent b0e23c4a24
commit 581c17169c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
server/sandbox.go
View file

@ -40,7 +40,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()
@ -48,7 +48,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
@ -63,9 +64,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
} }