From 49b4c34bb700c0f349ac489caea52103f48a0daa Mon Sep 17 00:00:00 2001
From: dongyuzhen <dongyuzhen@h-partners.com>
Date: Tue, 1 Jul 2025 17:12:35 +0800
Subject: [PATCH] execute delayKill when fd is exhausted

(cherry picked from commit aa6f67667bebb9c6c068e9c6efbba9254e2b78c8)
---
 containerd.spec                               |  8 ++++++-
 git-commit                                    |  2 +-
 ...ecute-delayKill-when-fd-is-exhausted.patch | 24 +++++++++++++++++++
 series.conf                                   |  1 +
 4 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 patch/0042-containerd-execute-delayKill-when-fd-is-exhausted.patch

diff --git a/containerd.spec b/containerd.spec
index 22e7efb..cb3e0d3 100644
--- a/containerd.spec
+++ b/containerd.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 Version:        1.6.22
 Name:           containerd
-Release:        18
+Release:        19
 Summary:        An industry-standard container runtime
 License:        ASL 2.0
 URL:            https://containerd.io
@@ -68,6 +68,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml
 %exclude %{_bindir}/containerd-stress
 
 %changelog
+* Tue Jul 01 2025 dongyuzhen <dongyuzhen@h-partners.com> - 1.6.22-19
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:execute delayKill when fd is exhausted
+
 * Mon Jun 30 2025 dongyuzhen <dongyuzhen@h-partners.com> - 1.6.22-18
 - Type:bugfix
 - ID:NA
diff --git a/git-commit b/git-commit
index c38337a..e68d712 100644
--- a/git-commit
+++ b/git-commit
@@ -1 +1 @@
-aeff92a1d3710fe6189d078d9444ad7183529869
+2e20c0953a2c7d9fe3fbe8970e8be341a6231939
diff --git a/patch/0042-containerd-execute-delayKill-when-fd-is-exhausted.patch b/patch/0042-containerd-execute-delayKill-when-fd-is-exhausted.patch
new file mode 100644
index 0000000..2d78e31
--- /dev/null
+++ b/patch/0042-containerd-execute-delayKill-when-fd-is-exhausted.patch
@@ -0,0 +1,24 @@
+From 5c69ba6febb4be566e05e758a02d93694457e598 Mon Sep 17 00:00:00 2001
+From: zhongjiawei <zhongjiawei1@huawei.com>
+Date: Thu, 12 Jun 2025 15:34:19 +0800
+Subject: [PATCH] containerd:execute delayKill when fd is exhausted
+
+---
+ runtime/v1/shim/service.go | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
+index dd1a9354..3a71aa0d 100644
+--- a/runtime/v1/shim/service.go
++++ b/runtime/v1/shim/service.go
+@@ -425,6 +425,7 @@ func (s *Service) Kill(ctx context.Context, r *shimapi.KillRequest) (*ptypes.Emp
+ 	if err != nil {
+ 		return nil, err
+ 	}
++	go delayKill(p)
+ 	if err := p.Kill(ctx, r.Signal, r.All); err != nil {
+ 		return nil, errdefs.ToGRPC(err)
+ 	}
+-- 
+2.33.0
+
diff --git a/series.conf b/series.conf
index b3f86a6..559715a 100644
--- a/series.conf
+++ b/series.conf
@@ -38,3 +38,4 @@ patch/0038-containerd-fix-CVE-2024-40635.patch
 patch/0039-containerd-Prevent-panic-in-Docker-pusher.patch
 patch/0040-containerd-client-fix-returned-error-in-the-defer-function.patch
 patch/0041-containerd-do-not-report-error-log-when-skip-otlp-pl.patch
+patch/0042-containerd-execute-delayKill-when-fd-is-exhausted.patch
-- 
Gitee