fix comments

Signed-off-by: Rouzip <1226015390@qq.com>
koordinator-sh · Jul 11, 2024 · 13e06eb · 13e06eb
1 parent a56f235
commit 13e06eb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 13 deletions.
diff --git a/pkg/koordlet/metricsadvisor/collectors/resctrl/resctrl_collector.go b/pkg/koordlet/metricsadvisor/collectors/resctrl/resctrl_collector.go
@@ -63,7 +63,7 @@ func New(opt *framework.Options) framework.Collector {
 // 4. check resctrl collector feature gate
 func (r *resctrlCollector) Enabled() bool {
 	isResctrlEnabled, _ := system.IsSupportResctrl()
-	isResctrlCollectorEnabled, _ := system.IsResctrlCollectorAvailableByCpuInfo()
+	isResctrlCollectorEnabled, _ := system.IsSupportResctrlCollector()
 	return r.resctrlCollectorGate &&
 		isResctrlEnabled && isResctrlCollectorEnabled &&
 		system.IsVendorSupportResctrl() &&

diff --git a/pkg/koordlet/util/system/config.go b/pkg/koordlet/util/system/config.go
@@ -72,6 +72,11 @@ func InitSupportConfigs() {
 	} else {
 		klog.V(4).Infof("resctrl supported: %v", isResctrlSupported)
 	}
+	if isResctrlCollectorSupported, err := IsSupportResctrlCollector(); err != nil {
+		klog.Warningf("failed to check resctrl collector support status, use %v, err: %v", isResctrlCollectorSupported, err)
+	} else {
+		klog.V(4).Infof("resctrl collector supported: %v", isResctrlCollectorSupported)
+	}
 }
 
 func NewHostModeConfig() *Config {

diff --git a/pkg/koordlet/util/system/resctrl.go b/pkg/koordlet/util/system/resctrl.go
@@ -62,11 +62,13 @@ const (
 )
 
 var (
-	initLock          sync.Mutex
-	isInit            bool
-	isSupportResctrl  bool
-	CacheIdsCacheFunc func() ([]int, error)
-	ARM_VENDOR_ID_MAP = map[string]struct{}{} // support MPAM ARM vendor ids
+	initLock                  sync.Mutex
+	isInit                    bool
+	isSupportResctrl          bool
+	isSupportResctrlCollector bool
+	collectorOnceFunc         sync.Once
+	CacheIdsCacheFunc         func() ([]int, error)
+	ARM_VENDOR_ID_MAP         = map[string]struct{}{} // support MPAM ARM vendor ids
 )
 
 func init() {
@@ -131,13 +133,16 @@ func IsSupportResctrl() (bool, error) {
 	return isSupportResctrl, nil
 }
 
-func IsResctrlCollectorAvailableByCpuInfo() (bool, error) {
-	initLock.Lock()
-	defer initLock.Unlock()
-	path := GetCPUInfoPath()
-	mbm, err1 := isResctrlMBMAvailableByCpuInfo(path)
-	cqm, err2 := isResctrlCQMAvailableByCpuInfo(path)
-	return mbm && cqm, multierr.Append(err1, err2)
+func IsSupportResctrlCollector() (bool, error) {
+	var err error
+	collectorOnceFunc.Do(func() {
+		path := GetCPUInfoPath()
+		mbm, err1 := isResctrlMBMAvailableByCpuInfo(path)
+		cqm, err2 := isResctrlCQMAvailableByCpuInfo(path)
+		isSupportResctrlCollector = mbm && cqm
+		err = multierr.Append(err1, err2)
+	})
+	return isSupportResctrlCollector, err
 }
 
 var (