sync upstream patches to support isulad container engine and systemd cgroup driver
This commit is contained in:
weiyucheng123
parent
4e4c643ed6
commit
f6633be4f1
76
patch/0010-support-isulad-container-engine.patch
Normal file
76
patch/0010-support-isulad-container-engine.patch
Normal file
@ -0,0 +1,76 @@
|
|||||||
|
From d704f38600a31138107460b7eba4a68a0b8362ea Mon Sep 17 00:00:00 2001
|
||||||
|
From: vegbir <yangjiaqi16@huawei.com>
|
||||||
|
Date: Tue, 26 Sep 2023 17:05:06 +0800
|
||||||
|
Subject: [PATCH] support isulad container engine
|
||||||
|
|
||||||
|
Signed-off-by: vegbir <yangjiaqi16@huawei.com>
|
||||||
|
---
|
||||||
|
pkg/core/typedef/containerinfo.go | 5 +++++
|
||||||
|
pkg/core/typedef/rawpod.go | 8 ++++++--
|
||||||
|
2 files changed, 11 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkg/core/typedef/containerinfo.go b/pkg/core/typedef/containerinfo.go
|
||||||
|
index 39cb2cc..d810e5b 100644
|
||||||
|
--- a/pkg/core/typedef/containerinfo.go
|
||||||
|
+++ b/pkg/core/typedef/containerinfo.go
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
package typedef
|
||||||
|
|
||||||
|
import (
|
||||||
|
+ "fmt"
|
||||||
|
"path/filepath"
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
@@ -32,12 +33,15 @@ const (
|
||||||
|
DOCKER
|
||||||
|
// CONTAINERD means containerd container engine
|
||||||
|
CONTAINERD
|
||||||
|
+ // ISULAD means isulad container engine
|
||||||
|
+ ISULAD
|
||||||
|
)
|
||||||
|
|
||||||
|
var (
|
||||||
|
supportEnginesPrefixMap = map[ContainerEngineType]string{
|
||||||
|
DOCKER: "docker://",
|
||||||
|
CONTAINERD: "containerd://",
|
||||||
|
+ ISULAD: "iSulad://",
|
||||||
|
}
|
||||||
|
currentContainerEngines = UNDEFINED
|
||||||
|
setContainerEnginesOnce sync.Once
|
||||||
|
@@ -85,6 +89,7 @@ func fixContainerEngine(containerID string) {
|
||||||
|
for engine, prefix := range supportEnginesPrefixMap {
|
||||||
|
if strings.HasPrefix(containerID, prefix) {
|
||||||
|
currentContainerEngines = engine
|
||||||
|
+ fmt.Printf("The container engine is %v\n", strings.Split(currentContainerEngines.Prefix(), ":")[0])
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/pkg/core/typedef/rawpod.go b/pkg/core/typedef/rawpod.go
|
||||||
|
index 59dfb59..138c580 100644
|
||||||
|
--- a/pkg/core/typedef/rawpod.go
|
||||||
|
+++ b/pkg/core/typedef/rawpod.go
|
||||||
|
@@ -149,7 +149,11 @@ func (pod *RawPod) ExtractContainerInfos() map[string]*ContainerInfo {
|
||||||
|
podCgroupPath := pod.CgroupPath()
|
||||||
|
for _, rawContainer := range nameRawContainersMap {
|
||||||
|
id, err := rawContainer.GetRealContainerID()
|
||||||
|
- if id == "" || err != nil {
|
||||||
|
+ if err != nil {
|
||||||
|
+ fmt.Printf("failed to parse container ID: %v\n", err)
|
||||||
|
+ continue
|
||||||
|
+ }
|
||||||
|
+ if id == "" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
idContainersMap[id] = NewContainerInfo(id, podCgroupPath, rawContainer)
|
||||||
|
@@ -169,7 +173,7 @@ func (cont *RawContainer) GetRealContainerID() (string, error) {
|
||||||
|
setContainerEnginesOnce.Do(func() { fixContainerEngine(cont.status.ContainerID) })
|
||||||
|
|
||||||
|
if !currentContainerEngines.Support(cont) {
|
||||||
|
- return "", fmt.Errorf("fatal error : unsupported container engine")
|
||||||
|
+ return "", fmt.Errorf("unsupported container engine: %v", cont.status.ContainerID)
|
||||||
|
}
|
||||||
|
|
||||||
|
cid := cont.status.ContainerID[len(currentContainerEngines.Prefix()):]
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
197
patch/0011-support-systemd-cgroup-driver.patch
Normal file
197
patch/0011-support-systemd-cgroup-driver.patch
Normal file
@ -0,0 +1,197 @@
|
|||||||
|
From f7cad7376bd823440df1f2f76c1d13cdfa8d4cbe Mon Sep 17 00:00:00 2001
|
||||||
|
From: suoxiaocong <suoxiaocong@kylinos.cn>
|
||||||
|
Date: Mon, 22 Apr 2024 15:52:03 +0800
|
||||||
|
Subject: [PATCH] support systemd cgroup driver
|
||||||
|
|
||||||
|
---
|
||||||
|
pkg/common/constant/constant.go | 7 +++++++
|
||||||
|
pkg/config/config.go | 12 +++++++-----
|
||||||
|
pkg/core/typedef/cgroup/common.go | 11 +++++++++++
|
||||||
|
pkg/core/typedef/containerinfo.go | 16 +++++++++++++++-
|
||||||
|
pkg/core/typedef/rawpod.go | 30 ++++++++++++++++++++++++++++--
|
||||||
|
pkg/rubik/rubik.go | 3 +++
|
||||||
|
6 files changed, 71 insertions(+), 8 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pkg/common/constant/constant.go b/pkg/common/constant/constant.go
|
||||||
|
index 6a1f69d..cf780b8 100644
|
||||||
|
--- a/pkg/common/constant/constant.go
|
||||||
|
+++ b/pkg/common/constant/constant.go
|
||||||
|
@@ -113,3 +113,10 @@ const (
|
||||||
|
// PSIIOCgroupFileName is name of cgroup file used for detecting io psi
|
||||||
|
PSIIOCgroupFileName = "io.pressure"
|
||||||
|
)
|
||||||
|
+
|
||||||
|
+const (
|
||||||
|
+ // CgroupDriverSystemd is global config for cgroupfs driver choice: systemd driver
|
||||||
|
+ CgroupDriverSystemd = "systemd"
|
||||||
|
+ // CgroupDriverCgroupfs is global config for cgroupfs driver choice: cgroupfs driver
|
||||||
|
+ CgroupDriverCgroupfs = "cgroupfs"
|
||||||
|
+)
|
||||||
|
diff --git a/pkg/config/config.go b/pkg/config/config.go
|
||||||
|
index e0caef3..b8d31a5 100644
|
||||||
|
--- a/pkg/config/config.go
|
||||||
|
+++ b/pkg/config/config.go
|
||||||
|
@@ -44,6 +44,7 @@ type AgentConfig struct {
|
||||||
|
LogDir string `json:"logDir,omitempty"`
|
||||||
|
CgroupRoot string `json:"cgroupRoot,omitempty"`
|
||||||
|
EnabledFeatures []string `json:"enabledFeatures,omitempty"`
|
||||||
|
+ CgroupDriver string `json:"cgroupDriver,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// NewConfig returns an config object pointer
|
||||||
|
@@ -51,11 +52,12 @@ func NewConfig(pType parserType) *Config {
|
||||||
|
c := &Config{
|
||||||
|
ConfigParser: defaultParserFactory.getParser(pType),
|
||||||
|
Agent: &AgentConfig{
|
||||||
|
- LogDriver: constant.LogDriverStdio,
|
||||||
|
- LogSize: constant.DefaultLogSize,
|
||||||
|
- LogLevel: constant.DefaultLogLevel,
|
||||||
|
- LogDir: constant.DefaultLogDir,
|
||||||
|
- CgroupRoot: constant.DefaultCgroupRoot,
|
||||||
|
+ LogDriver: constant.LogDriverStdio,
|
||||||
|
+ LogSize: constant.DefaultLogSize,
|
||||||
|
+ LogLevel: constant.DefaultLogLevel,
|
||||||
|
+ LogDir: constant.DefaultLogDir,
|
||||||
|
+ CgroupRoot: constant.DefaultCgroupRoot,
|
||||||
|
+ CgroupDriver: constant.CgroupDriverCgroupfs,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return c
|
||||||
|
diff --git a/pkg/core/typedef/cgroup/common.go b/pkg/core/typedef/cgroup/common.go
|
||||||
|
index 11002ab..668f951 100644
|
||||||
|
--- a/pkg/core/typedef/cgroup/common.go
|
||||||
|
+++ b/pkg/core/typedef/cgroup/common.go
|
||||||
|
@@ -25,6 +25,17 @@ import (
|
||||||
|
)
|
||||||
|
|
||||||
|
var rootDir = constant.DefaultCgroupRoot
|
||||||
|
+var cgroupDriver = constant.CgroupDriverCgroupfs
|
||||||
|
+
|
||||||
|
+// SetCgroupDriver is the setter of global cgroup driver
|
||||||
|
+func SetCgroupDriver(driver string) {
|
||||||
|
+ cgroupDriver = driver
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+// GetCgroupDriver is the getter of global cgroup driver
|
||||||
|
+func GetCgroupDriver() string {
|
||||||
|
+ return cgroupDriver
|
||||||
|
+}
|
||||||
|
|
||||||
|
// AbsoluteCgroupPath returns the absolute path of the cgroup
|
||||||
|
func AbsoluteCgroupPath(elem ...string) string {
|
||||||
|
diff --git a/pkg/core/typedef/containerinfo.go b/pkg/core/typedef/containerinfo.go
|
||||||
|
index d810e5b..f751b25 100644
|
||||||
|
--- a/pkg/core/typedef/containerinfo.go
|
||||||
|
+++ b/pkg/core/typedef/containerinfo.go
|
||||||
|
@@ -20,6 +20,7 @@ import (
|
||||||
|
"strings"
|
||||||
|
"sync"
|
||||||
|
|
||||||
|
+ "isula.org/rubik/pkg/common/constant"
|
||||||
|
"isula.org/rubik/pkg/core/typedef/cgroup"
|
||||||
|
)
|
||||||
|
|
||||||
|
@@ -45,6 +46,11 @@ var (
|
||||||
|
}
|
||||||
|
currentContainerEngines = UNDEFINED
|
||||||
|
setContainerEnginesOnce sync.Once
|
||||||
|
+ containerEngineScopes = map[ContainerEngineType]string{
|
||||||
|
+ DOCKER: "docker",
|
||||||
|
+ CONTAINERD: "cri-containerd",
|
||||||
|
+ ISULAD: "isulad",
|
||||||
|
+ }
|
||||||
|
)
|
||||||
|
|
||||||
|
// Support returns true when the container uses the container engine
|
||||||
|
@@ -76,10 +82,18 @@ type ContainerInfo struct {
|
||||||
|
// NewContainerInfo creates a ContainerInfo instance
|
||||||
|
func NewContainerInfo(id, podCgroupPath string, rawContainer *RawContainer) *ContainerInfo {
|
||||||
|
requests, limits := rawContainer.GetResourceMaps()
|
||||||
|
+ var path string
|
||||||
|
+ if cgroup.GetCgroupDriver() == constant.CgroupDriverSystemd {
|
||||||
|
+ scopeName := containerEngineScopes[currentContainerEngines]
|
||||||
|
+ path = filepath.Join(podCgroupPath, scopeName+"-"+id+".scope")
|
||||||
|
+ } else {
|
||||||
|
+ path = filepath.Join(podCgroupPath, id)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
return &ContainerInfo{
|
||||||
|
Name: rawContainer.status.Name,
|
||||||
|
ID: id,
|
||||||
|
- Hierarchy: cgroup.Hierarchy{Path: filepath.Join(podCgroupPath, id)},
|
||||||
|
+ Hierarchy: cgroup.Hierarchy{Path: path},
|
||||||
|
RequestResources: requests,
|
||||||
|
LimitResources: limits,
|
||||||
|
}
|
||||||
|
diff --git a/pkg/core/typedef/rawpod.go b/pkg/core/typedef/rawpod.go
|
||||||
|
index 138c580..895e9d4 100644
|
||||||
|
--- a/pkg/core/typedef/rawpod.go
|
||||||
|
+++ b/pkg/core/typedef/rawpod.go
|
||||||
|
@@ -23,6 +23,7 @@ import (
|
||||||
|
"k8s.io/apimachinery/pkg/api/resource"
|
||||||
|
|
||||||
|
"isula.org/rubik/pkg/common/constant"
|
||||||
|
+ "isula.org/rubik/pkg/core/typedef/cgroup"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
@@ -103,7 +104,7 @@ func (pod *RawPod) CgroupPath() string {
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
/*
|
||||||
|
- example:
|
||||||
|
+ for cgroupfs cgroup driver
|
||||||
|
1. Burstable: pod requests are less than the value of limits and not 0;
|
||||||
|
kubepods/burstable/pod34152897-dbaf-11ea-8cb9-0653660051c3
|
||||||
|
2. BestEffort: pod requests and limits are both 0;
|
||||||
|
@@ -111,7 +112,32 @@ func (pod *RawPod) CgroupPath() string {
|
||||||
|
3. Guaranteed: pod requests are equal to the value set by limits;
|
||||||
|
kubepods/pod34152897-dbaf-11ea-8cb9-0653660051c3
|
||||||
|
*/
|
||||||
|
- return filepath.Join(constant.KubepodsCgroup, qosClassPath, constant.PodCgroupNamePrefix+id)
|
||||||
|
+ /*
|
||||||
|
+ for systemd cgroup driver
|
||||||
|
+ 1. burstable:
|
||||||
|
+ kubepods.slice/kubepods-burstable.slice/kubepods-burstable-podb895995a_e7e5_413e_9bc1_3c3895b3f233.slice
|
||||||
|
+ 2. besteffort
|
||||||
|
+ kubepods.slice/kubepods-besteffort.slice/kubepods-besteffort-podb895995a_e7e5_413e_9bc1_3c3895b3f233.slice
|
||||||
|
+ 3. guaranteed
|
||||||
|
+ kubepods.slice/kubepods-podb895995a_e7e5_413e_9bc1_3c3895b3f233.slice/
|
||||||
|
+ */
|
||||||
|
+
|
||||||
|
+ if cgroup.GetCgroupDriver() == constant.CgroupDriverSystemd {
|
||||||
|
+ if qosClassPath == "" {
|
||||||
|
+ return filepath.Join(
|
||||||
|
+ constant.KubepodsCgroup+".slice",
|
||||||
|
+ constant.KubepodsCgroup+"-"+constant.PodCgroupNamePrefix+strings.Replace(id, "-", "_", -1)+".slice",
|
||||||
|
+ )
|
||||||
|
+ }
|
||||||
|
+ return filepath.Join(
|
||||||
|
+ constant.KubepodsCgroup+".slice",
|
||||||
|
+ constant.KubepodsCgroup+"-"+qosClassPath+".slice",
|
||||||
|
+ constant.KubepodsCgroup+"-"+qosClassPath+"-"+constant.PodCgroupNamePrefix+strings.Replace(id, "-", "_", -1)+".slice",
|
||||||
|
+ )
|
||||||
|
+ } else {
|
||||||
|
+ return filepath.Join(constant.KubepodsCgroup, qosClassPath, constant.PodCgroupNamePrefix+id)
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
// ListRawContainers returns all RawContainers in the RawPod
|
||||||
|
diff --git a/pkg/rubik/rubik.go b/pkg/rubik/rubik.go
|
||||||
|
index f55e834..c4fc583 100644
|
||||||
|
--- a/pkg/rubik/rubik.go
|
||||||
|
+++ b/pkg/rubik/rubik.go
|
||||||
|
@@ -126,6 +126,9 @@ func runAgent(ctx context.Context) error {
|
||||||
|
|
||||||
|
// 3. enable cgroup system
|
||||||
|
cgroup.InitMountDir(c.Agent.CgroupRoot)
|
||||||
|
+ if c.Agent.CgroupDriver != "" {
|
||||||
|
+ cgroup.SetCgroupDriver(c.Agent.CgroupDriver)
|
||||||
|
+ }
|
||||||
|
|
||||||
|
// 4. init service components
|
||||||
|
services.InitServiceComponents(defaultRubikFeature)
|
||||||
|
--
|
||||||
|
2.25.1
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: rubik
|
Name: rubik
|
||||||
Version: 2.0.0
|
Version: 2.0.0
|
||||||
Release: 3
|
Release: 4
|
||||||
Summary: Hybrid Deployment for Cloud Native
|
Summary: Hybrid Deployment for Cloud Native
|
||||||
License: Mulan PSL V2
|
License: Mulan PSL V2
|
||||||
URL: https://gitee.com/openeuler/rubik
|
URL: https://gitee.com/openeuler/rubik
|
||||||
@ -56,6 +56,12 @@ install -Dp ./build_rubik_image.sh %{buildroot}%{_sharedstatedir}/%{name}/build_
|
|||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri May 10 2024 weiyucheng <weiyucheng@kylinos.cn> - 2.0.0-4
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:restart
|
||||||
|
- DESC:sync upstream patches to support isulad container engine and systemd cgroup driver
|
||||||
|
|
||||||
* Mon Jun 19 2023 yangjiaqi <yangjiaqi16@huawei.com> - 2.0.0-3
|
* Mon Jun 19 2023 yangjiaqi <yangjiaqi16@huawei.com> - 2.0.0-3
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
@ -7,4 +7,6 @@ patch/0006-rubik-fix-that-value-of-memory.high_async_ratio-lost.patch
|
|||||||
patch/0007-bugfix-fix-typos-calling-order-of-waitgroup.patch
|
patch/0007-bugfix-fix-typos-calling-order-of-waitgroup.patch
|
||||||
patch/0008-rubik-test-coverage-improvement-for-pkg-config.patch
|
patch/0008-rubik-test-coverage-improvement-for-pkg-config.patch
|
||||||
patch/0009-rubik-optimize-dynamicAdjust-to-be-clear-and-add-log.patch
|
patch/0009-rubik-optimize-dynamicAdjust-to-be-clear-and-add-log.patch
|
||||||
|
patch/0010-support-isulad-container-engine.patch
|
||||||
|
patch/0011-support-systemd-cgroup-driver.patch
|
||||||
#end of file
|
#end of file
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user