Restore sandboxes on daemon restart

Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>

cmd/containerd-shim-runc-v2/main.go

@@ -22,8 +22,8 @@ package main
 import (
 	"context"
 
-	_ "github.com/containerd/containerd/runtime/v2/pause"
 	"github.com/containerd/containerd/runtime/v2/runc/manager"
+	_ "github.com/containerd/containerd/runtime/v2/runc/pause"
 	_ "github.com/containerd/containerd/runtime/v2/runc/task/plugin"
 	"github.com/containerd/containerd/runtime/v2/shim"
 )

cmd/ctr/commands/sandboxes/sandboxes.go

@@ -148,6 +148,8 @@ var removeCommand = cli.Command{
 		}
 		defer cancel()
 
+		force := context.Bool("force")
+
 		for _, id := range context.Args() {
 			sandbox, err := client.LoadSandbox(ctx, id)
 			if err != nil {
@@ -155,7 +157,15 @@ var removeCommand = cli.Command{
 				continue
 			}
 
-			err = sandbox.Shutdown(ctx, context.Bool("force"))
+			err = sandbox.Stop(ctx)
+			if err != nil {
+				log.G(ctx).WithError(err).Errorf("failed to stop sandbox %s", id)
+				if !force {
+					continue
+				}
+			}
+
+			err = sandbox.Delete(ctx)
 			if err != nil {
 				log.G(ctx).WithError(err).Errorf("failed to shutdown sandbox %s", id)
 				continue