Merge pull request #3019 from jcvenegas/stable-1.11-backports

Stable 1.11 backports

containerd-shim-v2/service.go

@@ -337,34 +337,46 @@ func (s *service) Create(ctx context.Context, r *taskAPI.CreateTaskRequest) (_ *
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	var c *container
-
-	c, err = create(ctx, s, r)
-	if err != nil {
-		return nil, err
-	}
-
-	c.status = task.StatusCreated
-
-	s.containers[r.ID] = c
+	type Result struct {
+		container *container
+		err       error
+	}
+	ch := make(chan Result, 1)
+	go func() {
+		container, err := create(ctx, s, r)
+		ch <- Result{container, err}
+	}()
 
-	s.send(&eventstypes.TaskCreate{
-		ContainerID: r.ID,
-		Bundle:      r.Bundle,
-		Rootfs:      r.Rootfs,
-		IO: &eventstypes.TaskIO{
-			Stdin:    r.Stdin,
-			Stdout:   r.Stdout,
-			Stderr:   r.Stderr,
-			Terminal: r.Terminal,
-		},
-		Checkpoint: r.Checkpoint,
-		Pid:        s.pid,
-	})
+	select {
+	case <-ctx.Done():
+		return nil, errors.Errorf("create container timeout: %v", r.ID)
+	case res := <-ch:
+		if res.err != nil {
+			return nil, res.err
+		}
+		container := res.container
+		container.status = task.StatusCreated
+
+		s.containers[r.ID] = container
+
+		s.send(&eventstypes.TaskCreate{
+			ContainerID: r.ID,
+			Bundle:      r.Bundle,
+			Rootfs:      r.Rootfs,
+			IO: &eventstypes.TaskIO{
+				Stdin:    r.Stdin,
+				Stdout:   r.Stdout,
+				Stderr:   r.Stderr,
+				Terminal: r.Terminal,
+			},
+			Checkpoint: r.Checkpoint,
+			Pid:        s.pid,
+		})
 
-	return &taskAPI.CreateTaskResponse{
-		Pid: s.pid,
-	}, nil
+		return &taskAPI.CreateTaskResponse{
+			Pid: s.pid,
+		}, nil
+	}
 }
 
 // Start a process

pkg/katautils/config.go

@@ -310,11 +310,11 @@ func (h hypervisor) defaultMaxVCPUs() uint32 {
 }
 
 func (h hypervisor) defaultMemSz() uint32 {
-	if h.MemorySize < vc.MinHypervisorMemory {
-		return defaultMemSize // MiB
+	if h.MemorySize > 0 {
+		return h.MemorySize
 	}
 
-	return h.MemorySize
+	return defaultMemSize
 }
 
 func (h hypervisor) defaultMemSlots() uint32 {

virtcontainers/container.go

@@ -1275,6 +1275,14 @@ func (c *Container) update(resources specs.LinuxResources) error {
 		}
 	}
 
+	// There currently isn't a notion of cpusets.cpus or mems being tracked
+	// inside of the guest. Make sure we clear these before asking agent to update
+	// the container's cgroups.
+	if resources.CPU != nil {
+		resources.CPU.Mems = ""
+		resources.CPU.Cpus = ""
+	}
+
 	return c.sandbox.agent.updateContainer(c.sandbox, *c, resources)
 }
 

virtcontainers/hypervisor.go

@@ -75,9 +75,6 @@ const (
 	// Port where the agent will send the logs. Logs are sent through the vsock in cases
 	// where the hypervisor has no console.sock, i.e firecracker
 	vSockLogsPort = 1025
-
-	// MinHypervisorMemory is the minimum memory required for a VM.
-	MinHypervisorMemory = 256
 )
 
 // In some architectures the maximum number of vCPUs depends on the number of physical cores.

virtcontainers/pkg/oci/utils.go

@@ -468,11 +468,7 @@ func addHypervisorMemoryOverrides(ocispec specs.Spec, sbConfig *vc.SandboxConfig
 	if value, ok := ocispec.Annotations[vcAnnotations.DefaultMemory]; ok {
 		memorySz, err := strconv.ParseUint(value, 10, 32)
 		if err != nil {
-			return fmt.Errorf("Error encountered parsing annotation for default_memory: %v, please specify positive numeric value greater than 8", err)
-		}
-
-		if memorySz < vc.MinHypervisorMemory {
-			return fmt.Errorf("Memory specified in annotation %s is less than minimum required %d, please specify a larger value", vcAnnotations.DefaultMemory, vc.MinHypervisorMemory)
+			return fmt.Errorf("Error encountered parsing annotation for default_memory: %v", err)
 		}
 
 		sbConfig.HypervisorConfig.MemorySize = uint32(memorySz)

virtcontainers/pkg/oci/utils_test.go

@@ -837,7 +837,6 @@ func TestAddHypervisorAnnotations(t *testing.T) {
 	assert.Error(err)
 
 	ocispec.Annotations[vcAnnotations.DefaultMaxVCPUs] = "1"
-	ocispec.Annotations[vcAnnotations.DefaultMemory] = fmt.Sprintf("%d", vc.MinHypervisorMemory+1)
 	assert.Error(err)
 }
 

virtcontainers/sandbox.go

@@ -1161,6 +1161,10 @@ func (s *Sandbox) CreateContainer(contConfig ContainerConfig) (VCContainer, erro
 			if len(s.config.Containers) > 0 {
 				// delete container config
 				s.config.Containers = s.config.Containers[:len(s.config.Containers)-1]
+				// need to flush change to persist storage
+				if newErr := s.storeSandbox(); newErr != nil {
+					s.Logger().WithError(newErr).Error("Fail to flush s.config.Containers change into sandbox store")
+				}
 			}
 		}
 	}()
@@ -1605,6 +1609,11 @@ func (s *Sandbox) Stop(force bool) error {
 		return err
 	}
 
+	// Stop communicating with the agent.
+	if err := s.agent.disconnect(); err != nil && !force {
+		return err
+	}
+
 	return nil
 }