diff --git a/containerd.spec b/containerd.spec index 580c09966119b4468767a1127e53e81cb08e3766..130761c3395e1a0c41526cd9fde3262103b15594 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 2c6889398d8e514b58870ee77505784b5da94cdf..f6081533186a1f3e3d5c6bfd343810a37813b975 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -e0b68a854fa5dda8a38b60888cf73a72ac1547e0 +2a93e293ef23be33747b03227e86cafd899f3930 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 0000000000000000000000000000000000000000..2d78e318a8270f6d82abe3bf59fa36f99c862a0f --- /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 +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 b3f86a6b025bb13ee5a30102c6b38ae77a3eb00d..559715aa0248e7dcc30fcb6bc398f8a941638d0a 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