opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-23 01:57:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix in-memory state tests

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #229
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-01-16 13:53:23 -05:00
committed by Atomic Bot
parent 54e258bfde
commit ff77941a31
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container.go
View File

@ -336,7 +336,11 @@ func (c *Container) Dependencies() []string {
dependsCtrs[c.config.CgroupNsCtr] = true dependsCtrs[c.config.CgroupNsCtr] = true
} }
depends := make([]string, len(dependsCtrs), 0) if len(dependsCtrs) == 0 {
return []string{}
}
depends := make([]string, 0, len(dependsCtrs))
for ctr, _ := range dependsCtrs { for ctr, _ := range dependsCtrs {
depends = append(depends, ctr) depends = append(depends, ctr)
} }

27
libpod/in_memory_state.go
View File

@ -26,6 +26,8 @@ func NewInMemoryState() (State, error) {
state.pods = make(map[string]*Pod) state.pods = make(map[string]*Pod)
state.containers = make(map[string]*Container) state.containers = make(map[string]*Container)
state.ctrDepends = make(map[string][]string)
state.podNameIndex = registrar.NewRegistrar() state.podNameIndex = registrar.NewRegistrar()
state.ctrNameIndex = registrar.NewRegistrar() state.ctrNameIndex = registrar.NewRegistrar()
@ -131,13 +133,10 @@ func (s *InMemoryState) AddContainer(ctr *Container) error {
s.containers[ctr.ID()] = ctr s.containers[ctr.ID()] = ctr
// Add containers this container depends on // Add containers this container depends on
s.addCtrToDependsMap(ctr.ID(), ctr.config.IPCNsCtr) depCtrs := ctr.Dependencies()
s.addCtrToDependsMap(ctr.ID(), ctr.config.MountNsCtr) for _, depCtr := range depCtrs {
s.addCtrToDependsMap(ctr.ID(), ctr.config.NetNsCtr) s.addCtrToDependsMap(ctr.ID(), depCtr)
s.addCtrToDependsMap(ctr.ID(), ctr.config.PIDNsCtr) }
s.addCtrToDependsMap(ctr.ID(), ctr.config.UserNsCtr)
s.addCtrToDependsMap(ctr.ID(), ctr.config.UTSNsCtr)
s.addCtrToDependsMap(ctr.ID(), ctr.config.CgroupNsCtr)
return nil return nil
} }
@ -167,13 +166,11 @@ func (s *InMemoryState) RemoveContainer(ctr *Container) error {
delete(s.ctrDepends, ctr.ID()) delete(s.ctrDepends, ctr.ID())
s.removeCtrFromDependsMap(ctr.ID(), ctr.config.IPCNsCtr) // Remove us from container dependencies
s.removeCtrFromDependsMap(ctr.ID(), ctr.config.MountNsCtr) depCtrs := ctr.Dependencies()
s.removeCtrFromDependsMap(ctr.ID(), ctr.config.NetNsCtr) for _, depCtr := range depCtrs {
s.removeCtrFromDependsMap(ctr.ID(), ctr.config.PIDNsCtr) s.removeCtrFromDependsMap(ctr.ID(), depCtr)
s.removeCtrFromDependsMap(ctr.ID(), ctr.config.UserNsCtr) }
s.removeCtrFromDependsMap(ctr.ID(), ctr.config.UTSNsCtr)
s.removeCtrFromDependsMap(ctr.ID(), ctr.config.CgroupNsCtr)
return nil return nil
} }
@ -479,7 +476,7 @@ func (s *InMemoryState) removeCtrFromDependsMap(ctrID, dependsID string) {
return return
} }
newArr := make([]string, len(arr), 0) newArr := make([]string, 0, len(arr))
for _, id := range arr { for _, id := range arr {
if id != ctrID { if id != ctrID {