github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-26 07:22:20 +00:00
Code Issues Projects Releases Wiki Activity

virtcontainers: improve algorithm to find containers

Browse Source 
Do not iterate over a map to find a container, use map built-in
method instead.

fixes #2254

Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
Julio Montes 2019-11-22 20:08:37 +00:00
parent fea166d8eb
commit 7f67b9f084
2 changed files with 42 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
virtcontainers/api.go
View File

@ -589,42 +589,40 @@ func StatusContainer(ctx context.Context, sandboxID, containerID string) (Contai
// taken from the caller, even if we simply return the container status without // taken from the caller, even if we simply return the container status without
// taking any action regarding the container. // taking any action regarding the container.
func statusContainer(sandbox *Sandbox, containerID string) (ContainerStatus, error) { func statusContainer(sandbox *Sandbox, containerID string) (ContainerStatus, error) {
for _, container := range sandbox.containers { if container, ok := sandbox.containers[containerID]; ok {
if container.id == containerID { // We have to check for the process state to make sure
// We have to check for the process state to make sure // we update the status in case the process is supposed
// we update the status in case the process is supposed // to be running but has been killed or terminated.
// to be running but has been killed or terminated. if (container.state.State == types.StateReady ||
if (container.state.State == types.StateReady || container.state.State == types.StateRunning ||
container.state.State == types.StateRunning || container.state.State == types.StatePaused) &&
container.state.State == types.StatePaused) && container.process.Pid > 0 {
container.process.Pid > 0 {
running, err := isShimRunning(container.process.Pid) running, err := isShimRunning(container.process.Pid)
if err != nil { if err != nil {
return ContainerStatus{}, err return ContainerStatus{}, err
}
if !running {
virtLog.WithFields(logrus.Fields{
"state": container.state.State,
"pid": container.process.Pid}).
Info("container isn't running")
if err := container.stop(true); err != nil {
return ContainerStatus{}, err
}
}
} }
return ContainerStatus{ if !running {
ID: container.id, virtLog.WithFields(logrus.Fields{
State: container.state, "state": container.state.State,
PID: container.process.Pid, "pid": container.process.Pid}).
StartTime: container.process.StartTime, Info("container isn't running")
RootFs: container.config.RootFs.Target, if err := container.stop(true); err != nil {
Spec: container.GetOCISpec(), return ContainerStatus{}, err
Annotations: container.config.Annotations, }
}, nil }
} }
return ContainerStatus{
ID: container.id,
State: container.state,
PID: container.process.Pid,
StartTime: container.process.StartTime,
RootFs: container.config.RootFs.Target,
Spec: container.GetOCISpec(),
Annotations: container.config.Annotations,
}, nil
} }
// No matching containers in the sandbox // No matching containers in the sandbox

27
virtcontainers/sandbox.go
View File

@ -752,10 +752,8 @@ func (s *Sandbox) findContainer(containerID string) (*Container, error) {
return nil, vcTypes.ErrNeedContainerID return nil, vcTypes.ErrNeedContainerID
} }
for id, c := range s.containers { if c, ok := s.containers[containerID]; ok {
if containerID == id { return c, nil
return c, nil
}
} }
return nil, errors.Wrapf(vcTypes.ErrNoSuchContainer, "Could not find the container %q from the sandbox %q containers list", return nil, errors.Wrapf(vcTypes.ErrNoSuchContainer, "Could not find the container %q from the sandbox %q containers list",
@ -1324,21 +1322,20 @@ func (s *Sandbox) StatusContainer(containerID string) (ContainerStatus, error) {
return ContainerStatus{}, vcTypes.ErrNeedContainerID return ContainerStatus{}, vcTypes.ErrNeedContainerID
} }
for id, c := range s.containers { if c, ok := s.containers[containerID]; ok {
rootfs := c.config.RootFs.Source rootfs := c.config.RootFs.Source
if c.config.RootFs.Mounted { if c.config.RootFs.Mounted {
rootfs = c.config.RootFs.Target rootfs = c.config.RootFs.Target
} }
if id == containerID {
return ContainerStatus{ return ContainerStatus{
ID: c.id, ID: c.id,
State: c.state, State: c.state,
PID: c.process.Pid, PID: c.process.Pid,
StartTime: c.process.StartTime, StartTime: c.process.StartTime,
RootFs: rootfs, RootFs: rootfs,
Annotations: c.config.Annotations, Annotations: c.config.Annotations,
}, nil }, nil
}
} }
return ContainerStatus{}, vcTypes.ErrNoSuchContainer return ContainerStatus{}, vcTypes.ErrNoSuchContainer