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

Merge pull request #667 from 14rcole/containerserver-state

Browse source 
move container state to libkpod
This commit is contained in:
Antonio Murdaca 2017-07-20 16:42:31 +02:00 • committed by GitHub
commit ab1fef9e1f
4 changed files with 51 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
server/container.go
View file

@ -16,7 +16,7 @@ func (s *Server) getContainerFromRequest(cid string) (*oci.Container, error) {
return nil, fmt.Errorf("container with ID starting with %s not found: %v", cid, err)
}
c := s.state.containers.Get(containerID)
c := s.ContainerServer.GetContainer(containerID)
if c == nil {
return nil, fmt.Errorf("specified container not found: %s", containerID)
}

4
server/container_list.go
View file

@ -31,7 +31,7 @@ func (s *Server) ListContainers(ctx context.Context, req *pb.ListContainersReque
logrus.Debugf("ListContainersRequest %+v", req)
var ctrs []*pb.Container
filter := req.Filter
ctrList := s.state.containers.List()
ctrList := s.ContainerServer.ListContainers()
// Filter using container id and pod id first.
if filter != nil {
@ -40,7 +40,7 @@ func (s *Server) ListContainers(ctx context.Context, req *pb.ListContainersReque
if err != nil {
return nil, err
}
c := s.state.containers.Get(id)
c := s.ContainerServer.GetContainer(id)
if c != nil {
if filter.PodSandboxId != "" {
if c.Sandbox() == filter.PodSandboxId {

16
server/server.go
View file

@ -568,8 +568,8 @@ func New(config *Config) (*Server, error) {
if err != nil {
return nil, err
}
sandboxes := make(map[string]*Sandbox)
containers := oci.NewMemoryStore()
netPlugin, err := ocicni.InitCNI(config.NetworkDir, config.PluginDir)
if err != nil {
return nil, err
@ -587,8 +587,7 @@ func New(config *Config) (*Server, error) {
hostportManager: hostportManager,
config: *config,
state: &serverState{
sandboxes: sandboxes,
containers: containers,
sandboxes: sandboxes,
},
seccompEnabled: seccomp.IsEnabled(),
appArmorEnabled: apparmor.IsEnabled(),
@ -646,13 +645,12 @@ func New(config *Config) (*Server, error) {
}()
logrus.Debugf("sandboxes: %v", s.state.sandboxes)
logrus.Debugf("containers: %v", s.state.containers)
logrus.Debugf("containers: %v", s.ContainerServer.ListContainers())
return s, nil
}
type serverState struct {
sandboxes map[string]*Sandbox
containers oci.ContainerStorer
sandboxes map[string]*Sandbox
}
func (s *Server) addSandbox(sb *Sandbox) {
@ -686,13 +684,13 @@ func (s *Server) addContainer(c *oci.Container) {
sandbox := s.state.sandboxes[c.Sandbox()]
// TODO(runcom): handle !ok above!!! otherwise it panics!
sandbox.AddContainer(c)
s.state.containers.Add(c.ID(), c)
s.ContainerServer.AddContainer(c)
s.stateLock.Unlock()
}
func (s *Server) getContainer(id string) *oci.Container {
s.stateLock.Lock()
c := s.state.containers.Get(id)
c := s.ContainerServer.GetContainer(id)
s.stateLock.Unlock()
return c
}
@ -712,6 +710,6 @@ func (s *Server) removeContainer(c *oci.Container) {
s.stateLock.Lock()
sandbox := s.state.sandboxes[c.Sandbox()]
sandbox.RemoveContainer(c)
s.state.containers.Delete(c.ID())
s.ContainerServer.RemoveContainer(c)
s.stateLock.Unlock()
}