feat(shim): clean up rootfs views on dead-shim delete path

Wrap the runc shim manager so containerd shim delete subcommand removes
rootfs view resources before the bundle is torn down.

Signed-off-by: sidneychang <2190206983@qq.com>

Author: sidneychang

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

@@ -17,11 +17,11 @@ package main
 import (
 	"context"
 
-	"github.com/containerd/containerd/runtime/v2/runc/manager"
 	"github.com/containerd/containerd/runtime/v2/shim"
 	_ "github.com/urunc-dev/urunc/pkg/containerd-shim"
+	containerdshim "github.com/urunc-dev/urunc/pkg/containerd-shim"
 )
 
 func main() {
-	shim.RunManager(context.Background(), manager.NewShimManager("io.containerd.urunc.v2"))
+	shim.RunManager(context.Background(), containerdshim.NewShimManager("io.containerd.urunc.v2"))
 }

pkg/containerd-shim/shim_manager.go

@@ -0,0 +1,79 @@
+// Copyright (c) 2023-2026, Nubificus LTD
+//
+// 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 containerdshim
+
+import (
+	"context"
+	"os"
+
+	"github.com/containerd/containerd/runtime/v2/runc/manager"
+	"github.com/containerd/containerd/runtime/v2/shim"
+	"github.com/containerd/log"
+	containerdShim "github.com/urunc-dev/urunc/pkg/containerd-shim/containerd"
+)
+
+const containerdGRPCAddressEnv = "GRPC_ADDRESS"
+
+func containerdGRPCAddress() string {
+	return os.Getenv(containerdGRPCAddressEnv)
+}
+
+type shimManager struct {
+	shim.Manager
+}
+
+func NewShimManager(runtime string) shim.Manager {
+	return &shimManager{Manager: manager.NewShimManager(runtime)}
+}
+
+func (m *shimManager) Stop(ctx context.Context, id string) (shim.StopStatus, error) {
+	bundle, err := os.Getwd()
+	if err != nil {
+		log.G(ctx).WithError(err).Warn("urunc(shim): getwd during delete failed")
+		return m.Manager.Stop(ctx, id)
+	}
+
+	shouldCleanup, snapshotter, err := containerdShim.ShouldCleanupRootfsView(bundle)
+	if err != nil {
+		log.G(ctx).WithError(err).Warn("urunc(shim): read rootfs view cleanup state from bundle during delete failed")
+		return m.Manager.Stop(ctx, id)
+	}
+	if !shouldCleanup {
+		return m.Manager.Stop(ctx, id)
+	}
+
+	address := containerdGRPCAddress()
+	if address == "" {
+		log.G(ctx).Warn("urunc(shim): containerd gRPC address unset during delete; rootfs view cleanup skipped")
+		return m.Manager.Stop(ctx, id)
+	}
+
+	session, err := containerdShim.OpenSession(ctx, address, id)
+	if err != nil {
+		log.G(ctx).WithError(err).Warn("urunc(shim): open containerd session for rootfs view cleanup failed")
+		return m.Manager.Stop(ctx, id)
+	}
+	defer func() {
+		if err := session.Close(); err != nil {
+			log.G(ctx).WithError(err).Warn("urunc(shim): failed to close containerd session after rootfs view cleanup")
+		}
+	}()
+
+	if err := containerdShim.NewRootfsViewAccessor(session).Cleanup(ctx, snapshotter); err != nil {
+		log.G(ctx).WithError(err).Warn("urunc(shim): rootfs view cleanup during delete failed")
+	}
+
+	return m.Manager.Stop(ctx, id)
+}