fix restart policy behaviour inconsistent

Signed-off-by: Kay Yan <kay.yan@daocloud.io>
containerd · Jun 16, 2023 · 5c4f460 · 5c4f460
1 parent 9f8655f
commit 5c4f460
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/cmd/nerdctl/container_run.go b/cmd/nerdctl/container_run.go
@@ -274,6 +274,9 @@ func processCreateCommandFlagsInRun(cmd *cobra.Command) (opt types.ContainerCrea
 	if err != nil {
 		return
 	}
+
+	opt.InRun = true
+
 	opt.Interactive, err = cmd.Flags().GetBool("interactive")
 	if err != nil {
 		return

diff --git a/pkg/api/types/container_types.go b/pkg/api/types/container_types.go
@@ -54,6 +54,9 @@ type ContainerCreateOptions struct {
 	// NerdctlArgs is the arguments of nerdctl
 	NerdctlArgs []string
 
+	// InRun is true when it's generated in the `run` command
+	InRun bool
+
 	// #region for basic flags
 	// Interactive keep STDIN open even if not attached
 	Interactive bool

diff --git a/pkg/cmd/container/create.go b/pkg/cmd/container/create.go
@@ -167,7 +167,7 @@ func Create(ctx context.Context, client *containerd.Client, args []string, netMa
 	}
 	internalLabels.logURI = logConfig.LogURI
 
-	restartOpts, err := generateRestartOpts(ctx, client, options.Restart, logConfig.LogURI)
+	restartOpts, err := generateRestartOpts(ctx, client, options.Restart, logConfig.LogURI, options.InRun)
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/pkg/cmd/container/run_restart.go b/pkg/cmd/container/run_restart.go
@@ -50,7 +50,7 @@ func checkRestartCapabilities(ctx context.Context, client *containerd.Client, re
 	return true, nil
 }
 
-func generateRestartOpts(ctx context.Context, client *containerd.Client, restartFlag, logURI string) ([]containerd.NewContainerOpts, error) {
+func generateRestartOpts(ctx context.Context, client *containerd.Client, restartFlag, logURI string, inRun bool) ([]containerd.NewContainerOpts, error) {
 	if restartFlag == "" || restartFlag == "no" {
 		return nil, nil
 	}
@@ -62,7 +62,11 @@ func generateRestartOpts(ctx context.Context, client *containerd.Client, restart
 	if err != nil {
 		return nil, err
 	}
-	opts := []containerd.NewContainerOpts{restart.WithPolicy(policy), restart.WithStatus(containerd.Running)}
+	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))
 	}

diff --git a/pkg/containerutil/containerutil.go b/pkg/containerutil/containerutil.go
@@ -105,6 +105,15 @@ func ContainerNetNSPath(ctx context.Context, c containerd.Container) (string, er
 	return fmt.Sprintf("/proc/%d/ns/net", task.Pid()), nil
 }
 
+// UpdateStatusLabel updates the "containerd.io/restart.status"
+// label of the container according to the value of restart desired status.
+func UpdateStatusLabel(ctx context.Context, container containerd.Container, status containerd.ProcessStatus) error {
+	opt := containerd.WithAdditionalContainerLabels(map[string]string{
+		restart.StatusLabel: string(status),
+	})
+	return container.Update(ctx, containerd.UpdateContainerOpts(opt))
+}
+
 // UpdateExplicitlyStoppedLabel updates the "containerd.io/restart.explicitly-stopped"
 // label of the container according to the value of explicitlyStopped.
 func UpdateExplicitlyStoppedLabel(ctx context.Context, container containerd.Container, explicitlyStopped bool) error {
@@ -205,6 +214,10 @@ func Start(ctx context.Context, container containerd.Container, flagA bool, clie
 			UpdateErrorLabel(ctx, container, err)
 		}
 	}()
+	if err := UpdateStatusLabel(ctx, container, containerd.Running); err != nil {
+		return err
+	}
+
 	lab, err := container.Labels(ctx)
 	if err != nil {
 		return err