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

new vendoring

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-09-20 10:16:59 +02:00
parent dee7479483
commit e269cb8b7e
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
350 changed files with 128937 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
server/server.go
View file

@ -47,6 +47,10 @@ func (s *Server) loadSandbox(id string) error {
return err
}
name := m.Annotations["ocid/name"]
name, err = s.reservePodName(id, name)
if err != nil {
return err
}
s.addSandbox(&sandbox{
id: id,
name: name,
@ -63,8 +67,9 @@ func (s *Server) loadSandbox(id string) error {
if err = s.runtime.UpdateStatus(scontainer); err != nil {
logrus.Warnf("error updating status for container %s: %v", scontainer, err)
}
s.podIDIndex.Add(id)
s.reservePodName(id, name)
if err = s.podIDIndex.Add(id); err != nil {
return err
}
return nil
}