Merge pull request containerd#6572 from fuweid/cp-1.6-6452-6571

mxpv · web-flow · commit 7078e50e2685 · 2022-02-21T10:52:38.000-08:00
[release/1.6] runc.v1/v2: return init pid when clean dead shim
diff --git a/runtime/v2/runc/manager/manager_linux.go b/runtime/v2/runc/manager/manager_linux.go
@@ -270,8 +270,13 @@ func (manager) Stop(ctx context.Context, id string) (shim.StopStatus, error) {
 	if err := mount.UnmountAll(filepath.Join(path, "rootfs"), 0); err != nil {
 		log.G(ctx).WithError(err).Warn("failed to cleanup rootfs mount")
 	}
+	pid, err := runcC.ReadPidFile(filepath.Join(path, process.InitPidFile))
+	if err != nil {
+		log.G(ctx).WithError(err).Warn("failed to read init pid file")
+	}
 	return shim.StopStatus{
 		ExitedAt:   time.Now(),
 		ExitStatus: 128 + int(unix.SIGKILL),
+		Pid:        pid,
 	}, nil
 }
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
@@ -259,9 +259,16 @@ func (s *service) Cleanup(ctx context.Context) (*taskAPI.DeleteResponse, error)
 	if err := mount.UnmountAll(filepath.Join(path, "rootfs"), 0); err != nil {
 		logrus.WithError(err).Warn("failed to cleanup rootfs mount")
 	}
+
+	pid, err := runcC.ReadPidFile(filepath.Join(path, process.InitPidFile))
+	if err != nil {
+		logrus.WithError(err).Warn("failed to read init pid file")
+	}
+
 	return &taskAPI.DeleteResponse{
 		ExitedAt:   time.Now(),
 		ExitStatus: 128 + uint32(unix.SIGKILL),
+		Pid:        uint32(pid),
 	}, nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -270,8 +270,13 @@ func (manager) Stop(ctx context.Context, id string) (shim.StopStatus, error) {`
`270`	`270`	`if err := mount.UnmountAll(filepath.Join(path, "rootfs"), 0); err != nil {`
`271`	`271`	`log.G(ctx).WithError(err).Warn("failed to cleanup rootfs mount")`
`272`	`272`	`}`
	`273`	`+ pid, err := runcC.ReadPidFile(filepath.Join(path, process.InitPidFile))`
	`274`	`+ if err != nil {`
	`275`	`+ log.G(ctx).WithError(err).Warn("failed to read init pid file")`
	`276`	`+ }`
`273`	`277`	`return shim.StopStatus{`
`274`	`278`	`ExitedAt: time.Now(),`
`275`	`279`	`ExitStatus: 128 + int(unix.SIGKILL),`
	`280`	`+ Pid: pid,`
`276`	`281`	`}, nil`
`277`	`282`	`}`