From 31cc3dd36c47218fd87ebdbdfef9fd61255b36df Mon Sep 17 00:00:00 2001 From: zhongjiawei Date: Thu, 21 Dec 2023 14:54:46 +0800 Subject: [PATCH] containerd:fix mission closed fifo --- containerd.spec | 8 +++- git-commit | 2 +- ...3-containerd-Fix-missing-closed-fifo.patch | 38 +++++++++++++++++++ series.conf | 1 + 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 patch/0033-containerd-Fix-missing-closed-fifo.patch diff --git a/containerd.spec b/containerd.spec index 58a04a4..8982f08 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.6.22 Name: containerd -Release: 5 +Release: 6 Summary: An industry-standard container runtime License: ASL 2.0 URL: https://containerd.io @@ -67,6 +67,12 @@ install -D -p -m 0644 %{S:7} %{buildroot}%{_sysconfdir}/containerd/config.toml %exclude %{_bindir}/containerd-stress %changelog +* Thu Dec 21 2023 zhongjiawei - 1.6.22-6 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix misssing closed fifo + * Wed Nov 08 2023 zhongjiawei - 1.6.22-5 - Type:bugfix - ID:NA diff --git a/git-commit b/git-commit index e32f9ce..1fed98f 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -5a7da853ca9b6dad3085882bcc32d7455c3db63a +bc83c0e00758f0b736e0ee02330ae080b292aadc diff --git a/patch/0033-containerd-Fix-missing-closed-fifo.patch b/patch/0033-containerd-Fix-missing-closed-fifo.patch new file mode 100644 index 0000000..cc8efcd --- /dev/null +++ b/patch/0033-containerd-Fix-missing-closed-fifo.patch @@ -0,0 +1,38 @@ +From 1c93da5ded1b80338ae4014084ce005f89e20a94 Mon Sep 17 00:00:00 2001 +From: Shiming Zhang +Date: Mon, 31 Oct 2022 17:18:27 +0800 +Subject: [PATCH] Fix missing closed fifo + +Signed-off-by: Shiming Zhang +--- + runtime/v1/shim/service_linux.go | 1 + + runtime/v2/runc/platform.go | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/runtime/v1/shim/service_linux.go b/runtime/v1/shim/service_linux.go +index 499490601..d6a07e04d 100644 +--- a/runtime/v1/shim/service_linux.go ++++ b/runtime/v1/shim/service_linux.go +@@ -61,6 +61,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console + // we need to shutdown epollConsole when pipe broken + epollConsole.Shutdown(p.epoller.CloseConsole) + epollConsole.Close() ++ in.Close() + }() + } + +diff --git a/runtime/v2/runc/platform.go b/runtime/v2/runc/platform.go +index c08d32912..65c017149 100644 +--- a/runtime/v2/runc/platform.go ++++ b/runtime/v2/runc/platform.go +@@ -86,6 +86,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console + // we need to shutdown epollConsole when pipe broken + epollConsole.Shutdown(p.epoller.CloseConsole) + epollConsole.Close() ++ in.Close() + }() + } + +-- +2.33.0 + diff --git a/series.conf b/series.conf index 83486fc..3c599ba 100644 --- a/series.conf +++ b/series.conf @@ -30,3 +30,4 @@ patch/0029-containerd-fix-unable-to-checkpoint-the-container-more-than-onc.patch patch/0030-containerd-fix-cio.Cancel-should-close-the-pipes.patch patch/0031-containerd-fix-some-containerd-bug.patch patch/0032-containerd-vendor-golang.org-x-net-v0.17.0.patch +patch/0033-containerd-Fix-missing-closed-fifo.patch -- Gitee