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

Separate container IDs from container names

Browse source 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
This commit is contained in:
Mrunal Patel 2016-10-04 16:50:29 -07:00
parent 484719c8fe
commit 0482a4281a
4 changed files with 50 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

3
oci/oci.go
View file

@ -229,8 +229,9 @@ type ContainerState struct {
} }
// NewContainer creates a container object. // NewContainer creates a container object.
func NewContainer(name string, bundlePath string, logPath string, labels map[string]string, sandbox string, terminal bool) (*Container, error) { func NewContainer(id string, name string, bundlePath string, logPath string, labels map[string]string, sandbox string, terminal bool) (*Container, error) {
c := &Container{ c := &Container{
id: id,
name: name, name: name,
bundlePath: bundlePath, bundlePath: bundlePath,
logPath: logPath, logPath: logPath,

67
server/container.go
View file

@ -29,9 +29,9 @@ func (s *Server) generateContainerIDandName(podName string, name string, attempt
err error err error
id = stringid.GenerateNonCryptoID() id = stringid.GenerateNonCryptoID()
) )
nameStr = fmt.Sprintf("%s-%s-%v", podName, name, attempt) nameStr := fmt.Sprintf("%s-%s-%v", podName, name, attempt)
if name == "infra" { if name == "infra" {
nameStr := fmt.Sprintf("%s-%s", podName, name) nameStr = fmt.Sprintf("%s-%s", podName, name)
} }
if name, err = s.reserveContainerName(id, nameStr); err != nil { if name, err = s.reserveContainerName(id, nameStr); err != nil {
return "", "", err return "", "", err
@ -67,6 +67,12 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig.Name is empty") return nil, fmt.Errorf("CreateContainerRequest.ContainerConfig.Name is empty")
} }
attempt := containerConfig.GetMetadata().GetAttempt()
containerID, containerName, err := s.generateContainerIDandName(sb.name, name, attempt)
if err != nil {
return nil, err
}
// containerDir is the dir for the container bundle. // containerDir is the dir for the container bundle.
containerDir := filepath.Join(s.runtime.ContainerDir(), name) containerDir := filepath.Join(s.runtime.ContainerDir(), name)
@ -78,7 +84,7 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
return nil, err return nil, err
} }
container, err := s.createSandboxContainer(name, sb, req.GetSandboxConfig(), containerDir, containerConfig) container, err := s.createSandboxContainer(containerID, containerName, sb, req.GetSandboxConfig(), containerDir, containerConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -94,11 +100,11 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
s.addContainer(container) s.addContainer(container)
return &pb.CreateContainerResponse{ return &pb.CreateContainerResponse{
ContainerId: &name, ContainerId: &containerID,
}, nil }, nil
} }
func (s *Server) createSandboxContainer(name string, sb *sandbox, SandboxConfig *pb.PodSandboxConfig, containerDir string, containerConfig *pb.ContainerConfig) (*oci.Container, error) { func (s *Server) createSandboxContainer(containerID string, containerName string, sb *sandbox, SandboxConfig *pb.PodSandboxConfig, containerDir string, containerConfig *pb.ContainerConfig) (*oci.Container, error) {
if sb == nil { if sb == nil {
return nil, errors.New("createSandboxContainer needs a sandbox") return nil, errors.New("createSandboxContainer needs a sandbox")
} }
@ -273,7 +279,7 @@ func (s *Server) createSandboxContainer(name string, sb *sandbox, SandboxConfig
} }
// Join the namespace paths for the pod sandbox container. // Join the namespace paths for the pod sandbox container.
podContainerName := sb.name + "-infra" podContainerName := sb.name + "-infra"
podInfraContainer := s.state.containers.Get(podContainerName) podInfraContainer := sb.getContainer(podContainerName)
podInfraState := s.runtime.ContainerStatus(podInfraContainer) podInfraState := s.runtime.ContainerStatus(podInfraContainer)
logrus.Infof("pod container state %v", podInfraState) logrus.Infof("pod container state %v", podInfraState)
@ -309,7 +315,7 @@ func (s *Server) createSandboxContainer(name string, sb *sandbox, SandboxConfig
return nil, err return nil, err
} }
container, err := oci.NewContainer(name, containerDir, logPath, labels, sb.id, containerConfig.GetTty()) container, err := oci.NewContainer(containerID, containerName, containerDir, logPath, labels, sb.id, containerConfig.GetTty())
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -319,18 +325,18 @@ func (s *Server) createSandboxContainer(name string, sb *sandbox, SandboxConfig
// StartContainer starts the container. // StartContainer starts the container.
func (s *Server) StartContainer(ctx context.Context, req *pb.StartContainerRequest) (*pb.StartContainerResponse, error) { func (s *Server) StartContainer(ctx context.Context, req *pb.StartContainerRequest) (*pb.StartContainerResponse, error) {
containerName := req.ContainerId containerID := req.GetContainerId()
if *containerName == "" { if containerID == "" {
return nil, fmt.Errorf("container ID should not be empty") return nil, fmt.Errorf("container ID should not be empty")
} }
c := s.state.containers.Get(*containerName) c := s.state.containers.Get(containerID)
if c == nil { if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName) return nil, fmt.Errorf("specified container not found: %s", containerID)
} }
if err := s.runtime.StartContainer(c); err != nil { if err := s.runtime.StartContainer(c); err != nil {
return nil, fmt.Errorf("failed to start container %s in sandbox %s: %v", c.Name(), *containerName, err) return nil, fmt.Errorf("failed to start container %s in sandbox %s: %v", c.Name(), containerID, err)
} }
return &pb.StartContainerResponse{}, nil return &pb.StartContainerResponse{}, nil
@ -338,18 +344,18 @@ func (s *Server) StartContainer(ctx context.Context, req *pb.StartContainerReque
// StopContainer stops a running container with a grace period (i.e., timeout). // StopContainer stops a running container with a grace period (i.e., timeout).
func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest) (*pb.StopContainerResponse, error) { func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest) (*pb.StopContainerResponse, error) {
containerName := req.ContainerId containerID := req.GetContainerId()
if *containerName == "" { if containerID == "" {
return nil, fmt.Errorf("container ID should not be empty") return nil, fmt.Errorf("container ID should not be empty")
} }
c := s.state.containers.Get(*containerName) c := s.state.containers.Get(containerID)
if c == nil { if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName) return nil, fmt.Errorf("specified container not found: %s", containerID)
} }
if err := s.runtime.StopContainer(c); err != nil { if err := s.runtime.StopContainer(c); err != nil {
return nil, fmt.Errorf("failed to stop container %s: %v", *containerName, err) return nil, fmt.Errorf("failed to stop container %s: %v", containerID, err)
} }
return &pb.StopContainerResponse{}, nil return &pb.StopContainerResponse{}, nil
@ -358,14 +364,14 @@ func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest
// RemoveContainer removes the container. If the container is running, the container // RemoveContainer removes the container. If the container is running, the container
// should be force removed. // should be force removed.
func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerRequest) (*pb.RemoveContainerResponse, error) { func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerRequest) (*pb.RemoveContainerResponse, error) {
containerName := req.ContainerId containerID := req.GetContainerId()
if *containerName == "" { if containerID == "" {
return nil, fmt.Errorf("container ID should not be empty") return nil, fmt.Errorf("container ID should not be empty")
} }
c := s.state.containers.Get(*containerName) c := s.state.containers.Get(containerID)
if c == nil { if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName) return nil, fmt.Errorf("specified container not found: %s", containerID)
} }
if err := s.runtime.UpdateStatus(c); err != nil { if err := s.runtime.UpdateStatus(c); err != nil {
@ -375,19 +381,20 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
cState := s.runtime.ContainerStatus(c) cState := s.runtime.ContainerStatus(c)
if cState.Status == ContainerStateCreated || cState.Status == ContainerStateRunning { if cState.Status == ContainerStateCreated || cState.Status == ContainerStateRunning {
if err := s.runtime.StopContainer(c); err != nil { if err := s.runtime.StopContainer(c); err != nil {
return nil, fmt.Errorf("failed to stop container %s: %v", *containerName, err) return nil, fmt.Errorf("failed to stop container %s: %v", containerID, err)
} }
} }
if err := s.runtime.DeleteContainer(c); err != nil { if err := s.runtime.DeleteContainer(c); err != nil {
return nil, fmt.Errorf("failed to delete container %s: %v", *containerName, err) return nil, fmt.Errorf("failed to delete container %s: %v", containerID, err)
} }
containerDir := filepath.Join(s.runtime.ContainerDir(), *containerName) containerDir := filepath.Join(s.runtime.ContainerDir(), containerID)
if err := os.RemoveAll(containerDir); err != nil { if err := os.RemoveAll(containerDir); err != nil {
return nil, fmt.Errorf("failed to remove container %s directory: %v", *containerName, err) return nil, fmt.Errorf("failed to remove container %s directory: %v", containerID, err)
} }
s.releaseContainerName(c.Name())
s.removeContainer(c) s.removeContainer(c)
return &pb.RemoveContainerResponse{}, nil return &pb.RemoveContainerResponse{}, nil
@ -432,15 +439,15 @@ func (s *Server) ListContainers(ctx context.Context, req *pb.ListContainersReque
// ContainerStatus returns status of the container. // ContainerStatus returns status of the container.
func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusRequest) (*pb.ContainerStatusResponse, error) { func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusRequest) (*pb.ContainerStatusResponse, error) {
containerName := req.ContainerId containerID := req.GetContainerId()
if *containerName == "" { if containerID == "" {
return nil, fmt.Errorf("container ID should not be empty") return nil, fmt.Errorf("container ID should not be empty")
} }
c := s.state.containers.Get(*containerName) c := s.state.containers.Get(containerID)
if c == nil { if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName) return nil, fmt.Errorf("specified container not found: %s", containerID)
} }
if err := s.runtime.UpdateStatus(c); err != nil { if err := s.runtime.UpdateStatus(c); err != nil {
@ -449,7 +456,7 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
csr := &pb.ContainerStatusResponse{ csr := &pb.ContainerStatusResponse{
Status: &pb.ContainerStatus{ Status: &pb.ContainerStatus{
Id: containerName, Id: &containerID,
}, },
} }

8
server/sandbox.go
View file

@ -139,12 +139,14 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
if err != nil { if err != nil {
return nil, err return nil, err
} }
containerID, containerName, err := s.generateContainerIDandName(name, "infra", 0)
g.AddAnnotation("ocid/labels", string(labelsJSON)) g.AddAnnotation("ocid/labels", string(labelsJSON))
g.AddAnnotation("ocid/annotations", string(annotationsJSON)) g.AddAnnotation("ocid/annotations", string(annotationsJSON))
g.AddAnnotation("ocid/log_path", logDir) g.AddAnnotation("ocid/log_path", logDir)
g.AddAnnotation("ocid/name", name) g.AddAnnotation("ocid/name", name)
containerName := name + "-infra"
g.AddAnnotation("ocid/container_name", containerName) g.AddAnnotation("ocid/container_name", containerName)
g.AddAnnotation("ocid/container_id", containerID)
s.addSandbox(&sandbox{ s.addSandbox(&sandbox{
id: id, id: id,
name: name, name: name,
@ -202,7 +204,7 @@ func (s *Server) RunPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
} }
} }
container, err := oci.NewContainer(containerName, podSandboxDir, podSandboxDir, labels, id, false) container, err := oci.NewContainer(containerID, containerName, podSandboxDir, podSandboxDir, labels, id, false)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -331,6 +333,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
return nil, fmt.Errorf("failed to remove container %s directory: %v", c.Name(), err) return nil, fmt.Errorf("failed to remove container %s directory: %v", c.Name(), err)
} }
s.releaseContainerName(c.Name())
s.removeContainer(c) s.removeContainer(c)
} }
@ -339,6 +342,7 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
if err := os.RemoveAll(podSandboxDir); err != nil { if err := os.RemoveAll(podSandboxDir); err != nil {
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.releaseContainerName(podInfraContainer.Name())
s.removeContainer(podInfraContainer) s.removeContainer(podInfraContainer)
s.releasePodName(sb.name) s.releasePodName(sb.name)

10
server/server.go
View file

@ -63,7 +63,7 @@ func (s *Server) loadSandbox(id string) error {
containers: oci.NewMemoryStore(), containers: oci.NewMemoryStore(),
}) })
sandboxPath := filepath.Join(s.sandboxDir, id) sandboxPath := filepath.Join(s.sandboxDir, id)
scontainer, err := oci.NewContainer(m.Annotations["ocid/container_name"], sandboxPath, sandboxPath, labels, id, false) scontainer, err := oci.NewContainer(m.Annotations["ocid/container_id"], m.Annotations["ocid/container_name"], sandboxPath, sandboxPath, labels, id, false)
if err != nil { if err != nil {
return err return err
} }
@ -217,13 +217,13 @@ func (s *Server) addContainer(c *oci.Container) {
sandbox := s.state.sandboxes[c.Sandbox()] sandbox := s.state.sandboxes[c.Sandbox()]
// TODO(runcom): handle !ok above!!! otherwise it panics! // TODO(runcom): handle !ok above!!! otherwise it panics!
sandbox.addContainer(c) sandbox.addContainer(c)
s.state.containers.Add(c.Name(), c) s.state.containers.Add(c.ID(), c)
s.stateLock.Unlock() s.stateLock.Unlock()
} }
func (s *Server) getContainer(name string) *oci.Container { func (s *Server) getContainer(id string) *oci.Container {
s.stateLock.Lock() s.stateLock.Lock()
c := s.state.containers.Get(name) c := s.state.containers.Get(id)
s.stateLock.Unlock() s.stateLock.Unlock()
return c return c
} }
@ -232,6 +232,6 @@ func (s *Server) removeContainer(c *oci.Container) {
s.stateLock.Lock() s.stateLock.Lock()
sandbox := s.state.sandboxes[c.Sandbox()] sandbox := s.state.sandboxes[c.Sandbox()]
sandbox.removeContainer(c) sandbox.removeContainer(c)
s.state.containers.Delete(c.Name()) s.state.containers.Delete(c.ID())
s.stateLock.Unlock() s.stateLock.Unlock()
} }