diff --git a/containerd.spec b/containerd.spec index 3ed7a42b37d9a1977ef514c6ac3a5eeb8e04d263..e10a8ae6d99f47d90b9a5183ff1619956d50ad2f 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 - 1.6.22-19 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:execute delayKill when fd is exhausted + * Mon Jun 30 2025 dongyuzhen - 1.6.22-18 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index f9580427a8c690805c4ea18355bd19fbe4b2cd23..082246bfe8fa40c090821ff83e4cfb0c6185b275 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -481de7cbe78b24fee27c0be4929a9fdc5648954b +5f1c1bffb37a2406a884cf60c59498065736571c diff --git a/patch/0041-containerd-execute-delayKill-when-fd-is-exhausted.patch b/patch/0041-containerd-execute-delayKill-when-fd-is-exhausted.patch new file mode 100644 index 0000000000000000000000000000000000000000..2d78e318a8270f6d82abe3bf59fa36f99c862a0f --- /dev/null +++ b/patch/0041-containerd-execute-delayKill-when-fd-is-exhausted.patch @@ -0,0 +1,24 @@ +From 5c69ba6febb4be566e05e758a02d93694457e598 Mon Sep 17 00:00:00 2001 +From: zhongjiawei +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 940ce180c85c19e16f473717febd07c3c08685a6..2525daad0bb8636bec75a6f4c440cf35decd05dd 100644 --- a/series.conf +++ b/series.conf @@ -37,3 +37,4 @@ patch/0037-containerd-fix-CVE-2024-40635.patch patch/0038-containerd-Prevent-panic-in-Docker-pusher.patch patch/0039-containerd-client-fix-returned-error-in-the-defer-function.patch patch/0040-containerd-do-not-report-error-log-when-skip-otlp-pl.patch +patch/0041-containerd-execute-delayKill-when-fd-is-exhausted.patch