bugfix: generate podlevel cgroup path with pod prefix

kubewharf · Dec 14, 2023 · e79e43a · e79e43a
1 parent f1c0c61
commit e79e43a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/cmd/katalyst-agent/app/agent/orm.go b/cmd/katalyst-agent/app/agent/orm.go
@@ -20,7 +20,6 @@ import (
 	"fmt"
 
 	"k8s.io/klog/v2"
-
 	plugincache "k8s.io/kubernetes/pkg/kubelet/pluginmanager/cache"
 
 	"github.com/kubewharf/katalyst-core/pkg/agent/resourcemanager/outofband"

diff --git a/cmd/katalyst-agent/app/options/options.go b/cmd/katalyst-agent/app/options/options.go
@@ -17,14 +17,14 @@ limitations under the License.
 package options
 
 import (
-	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/orm"
 	"k8s.io/apimachinery/pkg/util/errors"
 	cliflag "k8s.io/component-base/cli/flag"
 
 	"github.com/kubewharf/katalyst-core/cmd/base/options"
 	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/dynamic"
 	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/eviction"
 	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/global"
+	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/orm"
 	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/qrm"
 	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/reporter"
 	"github.com/kubewharf/katalyst-core/cmd/katalyst-agent/app/options/sysadvisor"

diff --git a/cmd/katalyst-agent/app/options/orm/orm_base.go b/cmd/katalyst-agent/app/options/orm/orm_base.go
@@ -19,9 +19,9 @@ package orm
 import (
 	"time"
 
-	ormconfig "github.com/kubewharf/katalyst-core/pkg/config/agent/orm"
-
 	cliflag "k8s.io/component-base/cli/flag"
+
+	ormconfig "github.com/kubewharf/katalyst-core/pkg/config/agent/orm"
 )
 
 type GenericORMPluginOptions struct {

diff --git a/pkg/util/cgroup/common/path.go b/pkg/util/cgroup/common/path.go
@@ -133,7 +133,7 @@ func GetKubernetesAnyExistRelativeCgroupPath(suffix string) (string, error) {
 
 // GetPodAbsCgroupPath returns absolute cgroup path for pod level
 func GetPodAbsCgroupPath(subsys, podUID string) (string, error) {
-	return GetKubernetesAnyExistAbsCgroupPath(subsys, podUID)
+	return GetKubernetesAnyExistAbsCgroupPath(subsys, fmt.Sprintf("%s%s", PodCgroupPathPrefix, podUID))
 }
 
 // GetContainerAbsCgroupPath returns absolute cgroup path for container level