containerd:remove stw gc sweep set for arm64

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<zhongjiawei1@huawei.com> - 1.6.22-10
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:remove stw gc sweep set for arm64
+
 * Thu Mar 14 2024 laokz<zhangkai@iscas.ac.cn> - 1.6.22-9
 - Type:enhancement
 - ID:NA

git-commit

@@ -1 +1 @@
-d85f40f15ded290c1da3817b33290932c021457f
+4d153fc0e0ed7a2cf8b54c7de8632cbe7a4281ec

patch/0012-containerd-stw-gc-sweep-for-arm64.patch

@@ -1,53 +0,0 @@
-From bd5ef07292289252531b73c371e95db1fc0a45c4 Mon Sep 17 00:00:00 2001
-From: jingrui <jingrui@huawei.com>
-Date: Fri, 18 Oct 2019 14:49:47 +0800
-Subject: [PATCH] containerd: stw gc sweep for arm64
-
-Change-Id: I855c13a21c72bf0e91563db7c11e1348a1a78d55
-Signed-off-by: jingrui <jingrui@huawei.com>
----
- 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
-

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