aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-06 07:54:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

sandbox: change container slice to a map

Browse Source 
ContainerID is supposed to be unique within a sandbox. It is better to use
a map to describe containers of a sandbox.

Fixes: #502

Signed-off-by: Peng Tao <bergwolf@gmail.com>
This commit is contained in:
Peng Tao
2018-07-23 08:32:11 +08:00
parent b244410443
commit f9d50723b9
3 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
virtcontainers/sandbox.go
View File

@@ -453,7 +453,7 @@ type Sandbox struct {
volumes []Volume
containers []*Container
containers map[string]*Container
runPath string
configPath string
@@ -522,8 +522,10 @@ func (s *Sandbox) GetAnnotations() map[string]string {
func (s *Sandbox) GetAllContainers() []VCContainer {
ifa := make([]VCContainer, len(s.containers))
for i, v := range s.containers {
i := 0
for _, v := range s.containers {
ifa[i] = v
i++
}
return ifa
@@ -531,8 +533,8 @@ func (s *Sandbox) GetAllContainers() []VCContainer {
// GetContainer returns the container named by the containerID.
func (s *Sandbox) GetContainer(containerID string) VCContainer {
for _, c := range s.containers {
if c.id == containerID {
for id, c := range s.containers {
if id == containerID {
return c
}
}
@@ -743,6 +745,7 @@ func newSandbox(sandboxConfig SandboxConfig, factory Factory) (*Sandbox, error)
config: &sandboxConfig,
devManager: deviceManager.NewDeviceManager(sandboxConfig.HypervisorConfig.BlockDeviceDriver),
volumes: sandboxConfig.Volumes,
containers: map[string]*Container{},
runPath: filepath.Join(runStoragePath, sandboxConfig.ID),
configPath: filepath.Join(configStoragePath, sandboxConfig.ID),
state: State{},
@@ -796,8 +799,8 @@ func (s *Sandbox) storeSandbox() error {
return err
}
for _, container := range s.containers {
err = s.storage.storeContainerResource(s.id, container.id, configFileType, *(container.config))
for id, container := range s.containers {
err = s.storage.storeContainerResource(s.id, id, configFileType, *(container.config))
if err != nil {
return err
}
@@ -849,8 +852,8 @@ func (s *Sandbox) findContainer(containerID string) (*Container, error) {
return nil, errNeedContainerID
}
for _, c := range s.containers {
if containerID == c.id {
for id, c := range s.containers {
if containerID == id {
return c, nil
}
}
@@ -870,15 +873,14 @@ func (s *Sandbox) removeContainer(containerID string) error {
return errNeedContainerID
}
for idx, c := range s.containers {
if containerID == c.id {
s.containers = append(s.containers[:idx], s.containers[idx+1:]...)
return nil
}
if _, ok := s.containers[containerID]; !ok {
return fmt.Errorf("Could not remove the container %q from the sandbox %q containers list",
containerID, s.id)
}
return fmt.Errorf("Could not remove the container %q from the sandbox %q containers list",
containerID, s.id)
delete(s.containers, containerID)
return nil
}
// Delete deletes an already created sandbox.
@@ -978,7 +980,10 @@ func (s *Sandbox) startVM() error {
}
func (s *Sandbox) addContainer(c *Container) error {
s.containers = append(s.containers, c)
if _, ok := s.containers[c.id]; ok {
return fmt.Errorf("Duplicated container: %s", c.id)
}
s.containers[c.id] = c
return nil
}
@@ -1090,8 +1095,8 @@ func (s *Sandbox) StatusContainer(containerID string) (ContainerStatus, error) {
return ContainerStatus{}, errNeedContainerID
}
for _, c := range s.containers {
if c.id == containerID {
for id, c := range s.containers {
if id == containerID {
return ContainerStatus{
ID: c.id,
State: c.state,