debian: Fix containerd shim v2 shutdown
Containerd uses the "process" killmode which shutsdown shim v1 container processes but it does not shutdown v2 container processes. As a result, when shutting down the server it will result in a longer shutdown time than compared to Centos 7. This is a temporary workaround until we update to containerd 1.5+. Test Plan PASS Build containerd with patch PASS Boot and unlock server PASS Reboot server check for continerd-shim processes in the syslog after the server reboots Story: 2009845 Task: 44456 Signed-off-by: Charles Short <charles.short@windriver.com> Change-Id: Iac496e9f2b7f3ccded5ea3e034db8bac2cfc0125
This commit is contained in:
parent
478a4e59ad
commit
a22ff43fc0
@ -0,0 +1,28 @@
|
||||
From b99170f7253066b85fb319e0f7a6efed4876d18d Mon Sep 17 00:00:00 2001
|
||||
From: Charles Short <charles.short@windriver.com>
|
||||
Date: Thu, 2 Jun 2022 10:43:05 -0400
|
||||
Subject: [PATCH] Fix containerd shutdown shim-v2
|
||||
|
||||
Fix the container-shim shutdown on debian.
|
||||
|
||||
Signed-off-by: Charles Short <charles.short@windriver.com>
|
||||
---
|
||||
containerd.service | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/containerd.service b/containerd.service
|
||||
index e4c082b..ffb1698 100644
|
||||
--- a/containerd.service
|
||||
+++ b/containerd.service
|
||||
@@ -23,7 +23,7 @@ ExecStart=/usr/local/bin/containerd
|
||||
|
||||
Type=notify
|
||||
Delegate=yes
|
||||
-KillMode=process
|
||||
+KillMode=mixed
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
# Having non-zero Limit*s causes performance problems due to accounting overhead
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,2 +1,3 @@
|
||||
0001-revert-to-v1.4.11.patch
|
||||
0002-customize-containerd-for-StarlingX.patch
|
||||
0003-Fix-containerd-shutdown-shim-v2.patch
|
||||
|
Loading…
Reference in New Issue
Block a user