fix: update status label should call after task is started

Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>

Author: ningmingxiao

cmd/nerdctl/container/container_run.go

@@ -27,6 +27,7 @@ import (
 
 	"github.com/containerd/console"
 	containerd "github.com/containerd/containerd/v2/client"
+	"github.com/containerd/containerd/v2/core/runtime/restart"
 	"github.com/containerd/log"
 
 	"github.com/containerd/nerdctl/v2/cmd/nerdctl/completion"
@@ -467,6 +468,18 @@ func runAction(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
+	// Set status label running should call after task is started.
+	_, restartPolicyExist := lab[restart.PolicyLabel]
+	if restartPolicyExist {
+		if err := containerutil.UpdateStatusLabel(ctx, c, containerd.Running); err != nil {
+			return err
+		}
+	}
+
+	if err := containerutil.UpdateExplicitlyStoppedLabel(ctx, c, false); err != nil {
+		return err
+	}
+
 	// Setup container healthchecks.
 	if err := healthcheck.CreateTimer(ctx, c, (*config.Config)(&createOpt.GOptions), createOpt.NerdctlCmd, createOpt.NerdctlArgs); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)

pkg/cmd/container/create.go

@@ -280,7 +280,7 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
 		internalLabels.logConfig.Driver = "json-file"
 	}
 
-	restartOpts, err := generateRestartOpts(ctx, client, options.Restart, logConfig.LogURI, options.InRun)
+	restartOpts, err := generateRestartOpts(ctx, client, options.Restart, logConfig.LogURI)
 	if err != nil {
 		return nil, generateRemoveStateDirFunc(ctx, id, internalLabels), err
 	}

pkg/cmd/container/run_restart.go

@@ -51,7 +51,7 @@ func checkRestartCapabilities(ctx context.Context, client *containerd.Client, re
 	return true, nil
 }
 
-func generateRestartOpts(ctx context.Context, client *containerd.Client, restartFlag, logURI string, inRun bool) ([]containerd.NewContainerOpts, error) {
+func generateRestartOpts(ctx context.Context, client *containerd.Client, restartFlag, logURI string) ([]containerd.NewContainerOpts, error) {
 	if restartFlag == "" || restartFlag == "no" {
 		return nil, nil
 	}
@@ -64,9 +64,6 @@ func generateRestartOpts(ctx context.Context, client *containerd.Client, restart
 		return nil, err
 	}
 	desireStatus := containerd.Created
-	if inRun {
-		desireStatus = containerd.Running
-	}
 	opts := []containerd.NewContainerOpts{restart.WithPolicy(policy), restart.WithStatus(desireStatus)}
 	if logURI != "" {
 		opts = append(opts, restart.WithLogURIString(logURI))

pkg/containerutil/containerutil.go

@@ -257,16 +257,6 @@ func Start(ctx context.Context, container containerd.Container, isAttach bool, i
 		return nil
 	}
 
-	_, restartPolicyExist := lab[restart.PolicyLabel]
-	if restartPolicyExist {
-		if err := UpdateStatusLabel(ctx, container, containerd.Running); err != nil {
-			return err
-		}
-	}
-
-	if err := UpdateExplicitlyStoppedLabel(ctx, container, false); err != nil {
-		return err
-	}
 	if oldTask, err := container.Task(ctx, nil); err == nil {
 		if _, err := oldTask.Delete(ctx); err != nil {
 			log.G(ctx).WithError(err).Debug("failed to delete old task")
@@ -302,6 +292,17 @@ func Start(ctx context.Context, container containerd.Container, isAttach bool, i
 		return err
 	}
 
+	// Set status label running should call after task is started.
+	_, restartPolicyExist := lab[restart.PolicyLabel]
+	if restartPolicyExist {
+		if err := UpdateStatusLabel(ctx, container, containerd.Running); err != nil {
+			return err
+		}
+	}
+	if err := UpdateExplicitlyStoppedLabel(ctx, container, false); err != nil {
+		return err
+	}
+
 	// If container has health checks configured, create and start systemd timer/service files.
 	if err := healthcheck.CreateTimer(ctx, container, cfg, nerdctlCmd, nerdctlArgs); err != nil {
 		return fmt.Errorf("failed to create healthcheck timer: %w", err)