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

use an in memory store for containers

Browse source 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
This commit is contained in:
Antonio Murdaca 2016-09-19 13:09:30 +02:00
parent 7fc874e05e
commit 35ef46f805
No known key found for this signature in database
GPG key ID: B2BEAD150DE936B9
5 changed files with 173 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

28
server/runtime.go
View file

@ -107,7 +107,7 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
name: name,
logDir: logDir,
labels: labels,
containers: make(map[string]*oci.Container),
containers: oci.NewMemoryStore(),
})
annotations := req.GetConfig().GetAnnotations()
@ -197,26 +197,22 @@ func (s *Server) StopPodSandbox(ctx context.Context, req *pb.StopPodSandboxReque
}
podInfraContainer := *sbName + "-infra"
sb.containersLock.Lock()
for _, c := range sb.containers {
containersList := sb.containers.List()
for _, c := range containersList {
if podInfraContainer == c.Name() {
podNamespace := ""
netnsPath, err := c.NetNsPath()
if err != nil {
sb.containersLock.Unlock()
return nil, err
}
if err := s.netPlugin.TearDownPod(netnsPath, podNamespace, *sbName, podInfraContainer); err != nil {
sb.containersLock.Unlock()
return nil, fmt.Errorf("failed to destroy network for container %s in sandbox %s: %v", c.Name(), *sbName, err)
}
}
if err := s.runtime.StopContainer(c); err != nil {
sb.containersLock.Unlock()
return nil, fmt.Errorf("failed to stop container %s in sandbox %s: %v", c.Name(), *sbName, err)
}
}
sb.containersLock.Unlock()
return &pb.StopPodSandboxResponse{}, nil
}
@ -236,23 +232,19 @@ func (s *Server) RemovePodSandbox(ctx context.Context, req *pb.RemovePodSandboxR
podInfraContainer := *sbName + "-infra"
// Delete all the containers in the sandbox
sb.containersLock.Lock()
for _, c := range sb.containers {
containersList := sb.containers.List()
for _, c := range containersList {
if err := s.runtime.DeleteContainer(c); err != nil {
sb.containersLock.Unlock()
return nil, fmt.Errorf("failed to delete container %s in sandbox %s: %v", c.Name(), *sbName, err)
}
if podInfraContainer == c.Name() {
sb.containersLock.Unlock()
continue
}
containerDir := filepath.Join(s.runtime.ContainerDir(), c.Name())
if err := os.RemoveAll(containerDir); err != nil {
sb.containersLock.Unlock()
return nil, fmt.Errorf("failed to remove container %s directory: %v", c.Name(), err)
}
}
sb.containersLock.Unlock()
// Remove the files related to the sandbox
podSandboxDir := filepath.Join(s.sandboxDir, *sbName)
@ -539,7 +531,7 @@ func (s *Server) CreateContainer(ctx context.Context, req *pb.CreateContainerReq
// Join the namespace paths for the pod sandbox container.
podContainerName := podSandboxId + "-infra"
podInfraContainer := s.state.containers[podContainerName]
podInfraContainer := s.state.containers.Get(podContainerName)
podInfraState := s.runtime.ContainerStatus(podInfraContainer)
logrus.Infof("pod container state %v", podInfraState)
@ -590,7 +582,7 @@ func (s *Server) StartContainer(ctx context.Context, req *pb.StartContainerReque
if *containerName == "" {
return nil, fmt.Errorf("container ID should not be empty")
}
c := s.state.containers[*containerName]
c := s.state.containers.Get(*containerName)
if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName)
}
@ -609,7 +601,7 @@ func (s *Server) StopContainer(ctx context.Context, req *pb.StopContainerRequest
if *containerName == "" {
return nil, fmt.Errorf("container ID should not be empty")
}
c := s.state.containers[*containerName]
c := s.state.containers.Get(*containerName)
if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName)
}
@ -629,7 +621,7 @@ func (s *Server) RemoveContainer(ctx context.Context, req *pb.RemoveContainerReq
if *containerName == "" {
return nil, fmt.Errorf("container ID should not be empty")
}
c := s.state.containers[*containerName]
c := s.state.containers.Get(*containerName)
if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName)
}
@ -660,7 +652,7 @@ func (s *Server) ContainerStatus(ctx context.Context, req *pb.ContainerStatusReq
if *containerName == "" {
return nil, fmt.Errorf("container ID should not be empty")
}
c := s.state.containers[*containerName]
c := s.state.containers.Get(*containerName)
if c == nil {
return nil, fmt.Errorf("specified container not found: %s", *containerName)

32
server/server.go
View file

@ -43,7 +43,7 @@ func New(runtimePath, sandboxDir, containerDir string) (*Server, error) {
return nil, err
}
sandboxes := make(map[string]*sandbox)
containers := make(map[string]*oci.Container)
containers := oci.NewMemoryStore()
netPlugin, err := ocicni.InitCNI("")
if err != nil {
return nil, err
@ -61,34 +61,26 @@ func New(runtimePath, sandboxDir, containerDir string) (*Server, error) {
type serverState struct {
sandboxes map[string]*sandbox
containers map[string]*oci.Container
containers oci.Store
}
type sandbox struct {
name string
logDir string
labels map[string]string
containersLock sync.Mutex
containers map[string]*oci.Container
name string
logDir string
labels map[string]string
containers oci.Store
}
func (s *sandbox) addContainer(c *oci.Container) {
s.containersLock.Lock()
s.containers[c.Name()] = c
s.containersLock.Unlock()
s.containers.Add(c.Name(), c)
}
func (s *sandbox) getContainer(name string) *oci.Container {
s.containersLock.Lock()
c := s.containers[name]
s.containersLock.Unlock()
return c
return s.containers.Get(name)
}
func (s *sandbox) removeContainer(c *oci.Container) {
s.containersLock.Lock()
delete(s.containers, c.Name())
s.containersLock.Unlock()
s.containers.Delete(c.Name())
}
func (s *Server) addSandbox(sb *sandbox) {
@ -115,13 +107,13 @@ func (s *Server) addContainer(c *oci.Container) {
s.stateLock.Lock()
sandbox := s.state.sandboxes[c.Sandbox()]
sandbox.addContainer(c)
s.state.containers[c.Name()] = c
s.state.containers.Add(c.Name(), c)
s.stateLock.Unlock()
}
func (s *Server) getContainer(name string) *oci.Container {
s.stateLock.Lock()
c := s.state.containers[name]
c := s.state.containers.Get(name)
s.stateLock.Unlock()
return c
}
@ -130,6 +122,6 @@ func (s *Server) removeContainer(c *oci.Container) {
s.stateLock.Lock()
sandbox := s.state.sandboxes[c.Sandbox()]
sandbox.removeContainer(c)
delete(s.state.containers, c.Name())
s.state.containers.Delete(c.Name())
s.stateLock.Unlock()
}