From f28e1587cb04bc4788fad3ba4b7c1d8f141941e9 Mon Sep 17 00:00:00 2001 From: zhongjiawei Date: Fri, 22 Mar 2024 14:23:22 +0800 Subject: [PATCH] containerd:remove stw gc sweep set for arm64 (cherry picked from commit bacfecc5bbd6afe47dad193794ef69d11c45333f) --- containerd.spec | 8 ++- git-commit | 2 +- ...12-containerd-stw-gc-sweep-for-arm64.patch | 53 ------------------- series.conf | 1 - 4 files changed, 8 insertions(+), 56 deletions(-) delete mode 100644 patch/0012-containerd-stw-gc-sweep-for-arm64.patch diff --git a/containerd.spec b/containerd.spec index e2d7532..30fd3c0 100644 --- a/containerd.spec +++ b/containerd.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Version: 1.6.22 Name: containerd -Release: 9 +Release: 10 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 +* Fri Mar 22 2024 zhongjiawei - 1.6.22-10 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove stw gc sweep set for arm64 + * Thu Mar 14 2024 laokz - 1.6.22-9 - Type:enhancement - ID:NA diff --git a/git-commit b/git-commit index cf35c11..23e5588 100644 --- a/git-commit +++ b/git-commit @@ -1 +1 @@ -d85f40f15ded290c1da3817b33290932c021457f +4d153fc0e0ed7a2cf8b54c7de8632cbe7a4281ec diff --git a/patch/0012-containerd-stw-gc-sweep-for-arm64.patch b/patch/0012-containerd-stw-gc-sweep-for-arm64.patch deleted file mode 100644 index c5f01c3..0000000 --- a/patch/0012-containerd-stw-gc-sweep-for-arm64.patch +++ /dev/null @@ -1,53 +0,0 @@ -From bd5ef07292289252531b73c371e95db1fc0a45c4 Mon Sep 17 00:00:00 2001 -From: jingrui -Date: Fri, 18 Oct 2019 14:49:47 +0800 -Subject: [PATCH] containerd: stw gc sweep for arm64 - -Change-Id: I855c13a21c72bf0e91563db7c11e1348a1a78d55 -Signed-off-by: jingrui ---- - cmd/containerd-shim/main_unix.go | 5 ----- - runtime/v1/shim/client/client.go | 4 ++++ - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/cmd/containerd-shim/main_unix.go b/cmd/containerd-shim/main_unix.go -index 8dfcd90..8a05d70 100644 ---- a/cmd/containerd-shim/main_unix.go -+++ b/cmd/containerd-shim/main_unix.go -@@ -87,11 +87,6 @@ func init() { - - func main() { - debug.SetGCPercent(40) -- go func() { -- for range time.Tick(30 * time.Second) { -- debug.FreeOSMemory() -- } -- }() - - if debugFlag { - logrus.SetLevel(logrus.DebugLevel) -diff --git a/runtime/v1/shim/client/client.go b/runtime/v1/shim/client/client.go -index 6e5eae5..fa145c8 100644 ---- a/runtime/v1/shim/client/client.go -+++ b/runtime/v1/shim/client/client.go -@@ -27,6 +27,7 @@ import ( - "net" - "os" - "path/filepath" -+ "runtime" - "strconv" - "strings" - "sync" -@@ -218,6 +219,9 @@ func newCommand(binary, daemonAddress string, debug bool, config shim.Config, so - cmd.SysProcAttr = getSysProcAttr() - cmd.ExtraFiles = append(cmd.ExtraFiles, socket) - cmd.Env = append(os.Environ(), "GOMAXPROCS=2") -+ if runtime.GOARCH == "arm64" { -+ cmd.Env = append(cmd.Env, "GODEBUG=gcstoptheworld=2") -+ } - cmd.Stdout = stdout - cmd.Stderr = stderr - return cmd, nil --- -2.33.0 - diff --git a/series.conf b/series.conf index 5e0d338..ed23048 100644 --- a/series.conf +++ b/series.conf @@ -9,7 +9,6 @@ patch/0008-containerd-skip-load-task-in-creating-and-optimize-i.patch patch/0009-containerd-support-kill-D-state-container.patch patch/0010-containerd-add-shim-exit-when-bundle-dir-does-not-ex.patch patch/0011-containerd-change-tmpfile-directory-when-exec.patch -patch/0012-containerd-stw-gc-sweep-for-arm64.patch patch/0013-containerd-modify-shim-initiative-exit-time-for-post.patch patch/0014-containerd-wrap-and-process-return-errors.patch patch/0015-containerd-add-timeout-for-shim.patch -- Gitee