Merge pull request #3818 from zzzzzzzzzy9/update

reset spec if update returned error

Author: AkihiroSuda

cmd/nerdctl/container/container_update.go

@@ -22,6 +22,7 @@ import (
 	"errors"
 	"fmt"
 	"runtime"
+	"time"
 
 	"github.com/docker/go-units"
 	runtimespec "github.com/opencontainers/runtime-spec/specs-go"
@@ -241,7 +242,7 @@ func getUpdateOption(cmd *cobra.Command, globalOptions types.GlobalCommandOption
 	return options, nil
 }
 
-func updateContainer(ctx context.Context, client *containerd.Client, id string, opts updateResourceOptions, cmd *cobra.Command) error {
+func updateContainer(ctx context.Context, client *containerd.Client, id string, opts updateResourceOptions, cmd *cobra.Command) (retErr error) {
 	container, err := client.LoadContainer(ctx, id)
 	if err != nil {
 		return err
@@ -339,12 +340,18 @@ func updateContainer(ctx context.Context, client *containerd.Client, id string,
 	}
 
 	if err := updateContainerSpec(ctx, container, spec); err != nil {
-		log.G(ctx).WithError(err).Errorf("Failed to update spec %+v for container %q", spec, id)
-		// reset spec on error.
-		if err := updateContainerSpec(ctx, container, oldSpec); err != nil {
-			log.G(ctx).WithError(err).Errorf("Failed to update spec %+v for container %q", oldSpec, id)
+		return fmt.Errorf("failed to update spec %+v for container %q", spec, id)
+	}
+	defer func() {
+		if retErr != nil {
+			deferCtx, deferCancel := context.WithTimeout(ctx, 1*time.Minute)
+			defer deferCancel()
+			// Reset spec on error.
+			if err := updateContainerSpec(deferCtx, container, oldSpec); err != nil {
+				log.G(ctx).WithError(err).Errorf("Failed to update spec %+v for container %q", oldSpec, id)
+			}
 		}
-	}
+	}()
 
 	restart, err := cmd.Flags().GetString("restart")
 	if err != nil {

cmd/nerdctl/container/container_update_linux_test.go

@@ -0,0 +1,33 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package container
+
+import (
+	"testing"
+
+	"github.com/containerd/nerdctl/v2/pkg/testutil"
+)
+
+func TestUpdateContainer(t *testing.T) {
+	testutil.DockerIncompatible(t)
+	testContainerName := testutil.Identifier(t)
+	base := testutil.NewBase(t)
+	base.Cmd("run", "-d", "--name", testContainerName, testutil.CommonImage, "sleep", "infinity").AssertOK()
+	defer base.Cmd("rm", "-f", testContainerName).Run()
+	base.Cmd("update", "--memory", "999999999", "--restart", "123", testContainerName).AssertFail()
+	base.Cmd("inspect", "--mode=native", testContainerName).AssertOutNotContains(`"limit": 999999999,`)
+}