From b7731e97dd280d2777a10b61388f01d32e2f9bf2 Mon Sep 17 00:00:00 2001 From: Julio Montes Date: Fri, 22 Nov 2019 18:08:40 +0000 Subject: [PATCH] virtcontainers: don't consider non-running container resources Don't hot add again non-running container resources to avoid having extra and useless resources fixes #2186 Signed-off-by: Julio Montes --- virtcontainers/sandbox.go | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/virtcontainers/sandbox.go b/virtcontainers/sandbox.go index 8dde060492..7a3bcb811e 100644 --- a/virtcontainers/sandbox.go +++ b/virtcontainers/sandbox.go @@ -1961,6 +1961,12 @@ func (s *Sandbox) updateResources() error { func (s *Sandbox) calculateSandboxMemory() int64 { memorySandbox := int64(0) for _, c := range s.config.Containers { + // Do not hot add again non-running containers resources + if cont, ok := s.containers[c.ID]; ok && cont.state.State == types.StateStopped { + s.Logger().WithField("container-id", c.ID).Debug("Do not taking into account memory resources of not running containers") + continue + } + if m := c.Resources.Memory; m != nil && m.Limit != nil { memorySandbox += *m.Limit } @@ -1972,6 +1978,12 @@ func (s *Sandbox) calculateSandboxCPUs() uint32 { mCPU := uint32(0) for _, c := range s.config.Containers { + // Do not hot add again non-running containers resources + if cont, ok := s.containers[c.ID]; ok && cont.state.State == types.StateStopped { + s.Logger().WithField("container-id", c.ID).Debug("Do not taking into account CPU resources of not running containers") + continue + } + if cpu := c.Resources.CPU; cpu != nil { if cpu.Period != nil && cpu.Quota != nil { mCPU += utils.CalculateMilliCPUs(*cpu.Quota, *cpu.Period)