containerd-shim-runc-v1: return init pid when clean dead shim

fuweid · fuweid · commit 7901f4b33189 · 2022-02-20T15:12:50.000+08:00
If containerd-shim-runc-v1 process dead abnormally, such as received kill -s 9 signal, panic or other unkown reasons, the containerd-shim-runc-v1 server can not reap runc container and forward init process exit event. This will lead the container leaked in dockerd. When shim dead, containerd will clean dead shim, here read init process pid and forward exit event with pid at the same time. Related to: containerd#6402 Signed-off-by: Jeff Zvier <zvier20@gmail.com> Signed-off-by: Wei Fu <fuweid89@gmail.com>
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
 }
 
