[Fix] 🐛 Memory Limit Error at Instances Restart / noCard Mode mayooot#10

Author: Harry-zklcdc

go.mod

@@ -4,7 +4,7 @@ go 1.23
 
 require (
 	github.com/commander-cli/cmd v1.6.0
-	github.com/docker/docker v27.5.1+incompatible
+	github.com/docker/docker v28.0.1+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/gin-gonic/gin v1.10.0
 	github.com/judwhite/go-svc v1.2.1

go.sum

@@ -25,8 +25,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
 github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
-github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
+github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=

internal/services/replicaset.go

@@ -10,7 +10,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
@@ -224,7 +223,7 @@ func (rs *ReplicaSetService) ExecuteContainer(name string, exec *models.Containe
 	}
 
 	ctx := context.Background()
-	execCreate, err := docker.Cli.ContainerExecCreate(ctx, fmt.Sprintf("%s-%d", name, version), types.ExecConfig{
+	execCreate, err := docker.Cli.ContainerExecCreate(ctx, fmt.Sprintf("%s-%d", name, version), container.ExecOptions{
 		AttachStderr: true,
 		AttachStdout: true,
 		Detach:       true,
@@ -236,7 +235,7 @@ func (rs *ReplicaSetService) ExecuteContainer(name string, exec *models.Containe
 		return resp, errors.Wrapf(err, "docker.ContainerExecCreate failed, name: %s, spec: %+v", name, exec)
 	}
 
-	hijackedResp, err := docker.Cli.ContainerExecAttach(ctx, execCreate.ID, types.ExecStartCheck{})
+	hijackedResp, err := docker.Cli.ContainerExecAttach(ctx, execCreate.ID, container.ExecAttachOptions{})
 	defer hijackedResp.Close()
 	if err != nil {
 		return resp, errors.Wrapf(err, "docker.ContainerExecAttach failed, name: %s, spec: %+v", name, exec)
@@ -445,7 +444,9 @@ func (rs *ReplicaSetService) patchGpu(name string, spec *models.GpuPatch, info *
 			name, len(uuids), uuids)
 	}
 	if spec.GpuCount == 0 {
-		info.HostConfig.Resources = container.Resources{}
+		info.HostConfig.Resources = container.Resources{
+			Memory: info.HostConfig.Memory,
+		}
 	} else {
 		uuids, err = schedulers.GpuScheduler.Apply(spec.GpuCount)
 		if err != nil {
@@ -704,6 +705,12 @@ func (rs *ReplicaSetService) RestartContainer(name string) (id, newContainerName
 		return id, newContainerName, errors.WithMessage(err, "services.containerCpusetCpus failed")
 	}
 
+	// get memory info
+	memory, err := rs.containerMemory(ctrVersionName)
+	if err != nil {
+		return id, newContainerName, errors.WithMessage(err, "services.containerMemory failed")
+	}
+
 	// get creation info from etcd
 	infoBytes, err := etcd.GetValue(etcd.Containers, name)
 	if err != nil {
@@ -742,6 +749,11 @@ func (rs *ReplicaSetService) RestartContainer(name string) (id, newContainerName
 		info.HostConfig.Resources.CpusetCpus = availableCpus
 	}
 
+	// check whether the container is using memory
+	if memory != 0 {
+		info.HostConfig.Resources.Memory = memory
+	}
+
 	//  create a container to replace the old one
 	id, newContainerName, kv, err := rs.runContainer(ctx, name, info, true)
 	if err != nil {

utils/copy.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/commander-cli/cmd"
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/network"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
@@ -102,7 +101,7 @@ func moveVolumeData(src, dest string) error {
 		return errors.Wrapf(err, "docker.ContainerStart failed, container: %s", resp.ID)
 	}
 
-	execCreate, err := docker.Cli.ContainerExecCreate(ctx, resp.ID, types.ExecConfig{
+	execCreate, err := docker.Cli.ContainerExecCreate(ctx, resp.ID, container.ExecOptions{
 		AttachStderr: true,
 		AttachStdout: true,
 		Detach:       true,
@@ -114,7 +113,7 @@ func moveVolumeData(src, dest string) error {
 		return errors.Wrapf(err, "docker.ContainerExecCreate failed, container: %s", resp.ID)
 	}
 
-	err = docker.Cli.ContainerExecStart(ctx, execCreate.ID, types.ExecStartCheck{})
+	err = docker.Cli.ContainerExecStart(ctx, execCreate.ID, container.ExecStartOptions{})
 	if err != nil {
 		return errors.Wrapf(err, "docker.ContainerExecAttach failed, container: %s", resp.ID)
 	}