feature: UpdateContainerResources of CRI Manager

Signed-off-by: Starnop <[email protected]>

Author: starnop

cri/v1alpha1/cri.go

@@ -689,7 +689,29 @@ func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListCont
 
 // UpdateContainerResources updates ContainerConfig of the container.
 func (c *CriManager) UpdateContainerResources(ctx context.Context, r *runtime.UpdateContainerResourcesRequest) (*runtime.UpdateContainerResourcesResponse, error) {
-	return nil, fmt.Errorf("UpdateContainerResources Not Implemented Yet")
+	containerID := r.GetContainerId()
+	container, err := c.ContainerMgr.Get(ctx, containerID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get container %q: %v", containerID, err)
+	}
+	container.Lock()
+	defer container.Unlock()
+
+	// cannot update container resource when it is in removing state
+	if container.State.Status == apitypes.StatusRemoving {
+		return nil, fmt.Errorf("cannot to update resource for container %q when it is in removing state", containerID)
+	}
+
+	resources := resourceToCriResource(r.GetLinux())
+	updateConfig := &apitypes.UpdateConfig{
+		Resources: resources,
+	}
+	err = c.ContainerMgr.Update(ctx, containerID, updateConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update resource for container %q with error: %v", containerID, err)
+	}
+
+	return &runtime.UpdateContainerResourcesResponse{}, nil
 }
 
 // ExecSync executes a command in the container, and returns the stdout output.

cri/v1alpha1/cri_utils.go

@@ -770,3 +770,27 @@ func parseUserFromImageUser(id string) string {
 	// no group, just return the id
 	return id
 }
+
+// resourceToCriResource converts OCILinuxResource to apitypes.Resources Object.
+func resourceToCriResource(newResource *runtime.LinuxContainerResources) apitypes.Resources {
+	var resources apitypes.Resources
+	if newResource.GetCpuPeriod() != 0 {
+		resources.CPUPeriod = newResource.GetCpuPeriod()
+	}
+	if newResource.GetCpuQuota() != 0 {
+		resources.CPUQuota = newResource.GetCpuQuota()
+	}
+	if newResource.GetCpuShares() != 0 {
+		resources.CPUShares = newResource.GetCpuShares()
+	}
+	if newResource.GetMemoryLimitInBytes() != 0 {
+		resources.Memory = newResource.GetMemoryLimitInBytes()
+	}
+	if newResource.GetCpusetCpus() != "" {
+		resources.CpusetCpus = newResource.GetCpusetCpus()
+	}
+	if newResource.GetCpusetMems() != "" {
+		resources.CpusetMems = newResource.GetCpusetMems()
+	}
+	return resources
+}

cri/v1alpha2/cri.go

@@ -686,7 +686,29 @@ func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListCont
 
 // UpdateContainerResources updates ContainerConfig of the container.
 func (c *CriManager) UpdateContainerResources(ctx context.Context, r *runtime.UpdateContainerResourcesRequest) (*runtime.UpdateContainerResourcesResponse, error) {
-	return nil, fmt.Errorf("UpdateContainerResources Not Implemented Yet")
+	containerID := r.GetContainerId()
+	container, err := c.ContainerMgr.Get(ctx, containerID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get container %q: %v", containerID, err)
+	}
+	container.Lock()
+	defer container.Unlock()
+
+	// cannot update container resource when it is in removing state
+	if container.State.Status == apitypes.StatusRemoving {
+		return nil, fmt.Errorf("cannot to update resource for container %q when it is in removing state", containerID)
+	}
+
+	resources := resourceToCriResource(r.GetLinux())
+	updateConfig := &apitypes.UpdateConfig{
+		Resources: resources,
+	}
+	err = c.ContainerMgr.Update(ctx, containerID, updateConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to update resource for container %q with error: %v", containerID, err)
+	}
+
+	return &runtime.UpdateContainerResourcesResponse{}, nil
 }
 
 // ReopenContainerLog asks runtime to reopen the stdout/stderr log file

cri/v1alpha2/cri_utils.go

@@ -791,3 +791,27 @@ func (c *CriManager) attachLog(logPath string, containerID string) error {
 	}
 	return nil
 }
+
+// resourceToCriResource converts OCILinuxResource to apitypes.Resources Object.
+func resourceToCriResource(newResource *runtime.LinuxContainerResources) apitypes.Resources {
+	var resources apitypes.Resources
+	if newResource.GetCpuPeriod() != 0 {
+		resources.CPUPeriod = newResource.GetCpuPeriod()
+	}
+	if newResource.GetCpuQuota() != 0 {
+		resources.CPUQuota = newResource.GetCpuQuota()
+	}
+	if newResource.GetCpuShares() != 0 {
+		resources.CPUShares = newResource.GetCpuShares()
+	}
+	if newResource.GetMemoryLimitInBytes() != 0 {
+		resources.Memory = newResource.GetMemoryLimitInBytes()
+	}
+	if newResource.GetCpusetCpus() != "" {
+		resources.CpusetCpus = newResource.GetCpusetCpus()
+	}
+	if newResource.GetCpusetMems() != "" {
+		resources.CpusetMems = newResource.GetCpusetMems()
+	}
+	return resources
+}

daemon/mgr/container.go

@@ -823,7 +823,7 @@ func (mgr *ContainerManager) Update(ctx context.Context, name string, config *ty
 	}
 
 	// TODO update restartpolicy when container is running.
-	if config.RestartPolicy.Name != "" {
+	if config.RestartPolicy != nil && config.RestartPolicy.Name != "" {
 		c.HostConfig.RestartPolicy = config.RestartPolicy
 	}