Merge pull request containerd#3460 from apostasie/dev-3440-locking

Fix regression from containerd#3446

Author: AkihiroSuda

pkg/cmd/container/commit.go

@@ -57,7 +57,7 @@ func Commit(ctx context.Context, client *containerd.Client, rawRef string, req s
 			if found.MatchCount > 1 {
 				return fmt.Errorf("multiple IDs found with provided prefix: %s", found.Req)
 			}
-			imageID, err := commit.Commit(ctx, client, found.Container, opts)
+			imageID, err := commit.Commit(ctx, client, found.Container, opts, options.GOptions)
 			if err != nil {
 				return err
 			}

pkg/cmd/container/remove.go

@@ -107,8 +107,23 @@ func RemoveContainer(ctx context.Context, c containerd.Container, globalOptions
 		return err
 	}
 
+	// Get datastore
+	dataStore, err := clientutil.DataStore(globalOptions.DataRoot, globalOptions.Address)
+	if err != nil {
+		return err
+	}
+
+	// Ensure we do have a stateDir label
+	stateDir := containerLabels[labels.StateDir]
+	if stateDir == "" {
+		stateDir, err = containerutil.ContainerStateDirPath(globalOptions.Namespace, dataStore, c.ID())
+		if err != nil {
+			return err
+		}
+	}
+
 	// Lock the container state
-	lf, err := containerutil.Lock(ctx, c)
+	lf, err := containerutil.Lock(stateDir)
 	if err != nil {
 		return err
 	}
@@ -132,11 +147,7 @@ func RemoveContainer(ctx context.Context, c containerd.Container, globalOptions
 	if err != nil {
 		return err
 	}
-	// Get datastore
-	dataStore, err := clientutil.DataStore(globalOptions.DataRoot, globalOptions.Address)
-	if err != nil {
-		return err
-	}
+
 	// Get namestore
 	nameStore, err := namestore.New(dataStore, containerNamespace)
 	if err != nil {

pkg/containerutil/lock.go

@@ -17,27 +17,12 @@
 package containerutil
 
 import (
-	"context"
-	"errors"
 	"path/filepath"
 
-	"github.com/containerd/containerd/v2/client"
-
-	"github.com/containerd/nerdctl/v2/pkg/labels"
 	"github.com/containerd/nerdctl/v2/pkg/store"
 )
 
-func Lock(ctx context.Context, c client.Container) (store.Store, error) {
-	containerLabels, err := c.Labels(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	stateDir := containerLabels[labels.StateDir]
-	if stateDir == "" {
-		return nil, errors.New("container is missing statedir label")
-	}
-
+func Lock(stateDir string) (store.Store, error) {
 	stor, err := store.New(filepath.Join(stateDir, "oplock"), 0, 0)
 	if err != nil {
 		return nil, err

pkg/imgutil/commit/commit.go

@@ -44,6 +44,8 @@ import (
 	"github.com/containerd/log"
 	"github.com/containerd/platforms"
 
+	"github.com/containerd/nerdctl/v2/pkg/api/types"
+	"github.com/containerd/nerdctl/v2/pkg/clientutil"
 	"github.com/containerd/nerdctl/v2/pkg/containerutil"
 	imgutil "github.com/containerd/nerdctl/v2/pkg/imgutil"
 	"github.com/containerd/nerdctl/v2/pkg/labels"
@@ -66,8 +68,29 @@ var (
 	emptyDigest  = digest.Digest("")
 )
 
-func Commit(ctx context.Context, client *containerd.Client, container containerd.Container, opts *Opts) (digest.Digest, error) {
-	lf, err := containerutil.Lock(ctx, container)
+func Commit(ctx context.Context, client *containerd.Client, container containerd.Container, opts *Opts, globalOptions types.GlobalCommandOptions) (digest.Digest, error) {
+	// Get labels
+	containerLabels, err := container.Labels(ctx)
+	if err != nil {
+		return emptyDigest, err
+	}
+
+	// Get datastore
+	dataStore, err := clientutil.DataStore(globalOptions.DataRoot, globalOptions.Address)
+	if err != nil {
+		return emptyDigest, err
+	}
+
+	// Ensure we do have a stateDir label
+	stateDir := containerLabels[labels.StateDir]
+	if stateDir == "" {
+		stateDir, err = containerutil.ContainerStateDirPath(globalOptions.Namespace, dataStore, container.ID())
+		if err != nil {
+			return emptyDigest, err
+		}
+	}
+
+	lf, err := containerutil.Lock(stateDir)
 	if err != nil {
 		return emptyDigest, err
 	}