fix the issue that CPU quota is 0 if it's not limited by cgroup

Signed-off-by: Yang Keao <[email protected]>

Author: YangKeao

pkg/util/cgmon/cgmon.go

@@ -38,8 +38,7 @@ var (
 	ctx             context.Context
 	cancel          context.CancelFunc
 	wg              sync.WaitGroup
-	cfgMaxProcs     int
-	lastMaxProcs    int
+	lastCPU         int
 	lastMemoryLimit uint64
 )
 
@@ -115,45 +114,44 @@ func refreshCgroupCPU() error {
 	quota := runtime.NumCPU()
 
 	// Get CPU quota from cgroup.
-	cpuPeriod, cpuQuota, err := cgroup.GetCPUPeriodAndQuota()
-	if err != nil {
-		return err
-	}
-	if cpuPeriod > 0 && cpuQuota > 0 {
+	cpuPeriod, cpuQuota, err := getCgroupCPUPeriodAndQuota()
+	if err == nil && cpuPeriod > 0 && cpuQuota > 0 {
 		ratio := float64(cpuQuota) / float64(cpuPeriod)
 		if ratio < float64(quota) {
 			quota = int(math.Ceil(ratio))
 		}
 	}
 
-	if quota != lastMaxProcs {
+	if quota != lastCPU {
 		log.Info("set the maxprocs", zap.Int("quota", quota))
 		metrics.MaxProcs.Set(float64(quota))
-		lastMaxProcs = quota
-	} else if lastMaxProcs == 0 {
-		log.Info("set the maxprocs", zap.Int("cfgMaxProcs", cfgMaxProcs))
-		metrics.MaxProcs.Set(float64(cfgMaxProcs))
-		lastMaxProcs = cfgMaxProcs
+		lastCPU = quota
 	}
-	return nil
+
+	return err
 }
 
 func refreshCgroupMemory() error {
-	memLimit, err := cgroup.GetMemoryLimit()
-	if err != nil {
-		return err
-	}
+	// Get the total memory limit from `procfs`
 	vmem, err := mem.VirtualMemory()
 	if err != nil {
 		return err
 	}
-	if memLimit > vmem.Total {
-		memLimit = vmem.Total
+	memLimit := vmem.Total
+
+	// Try to update the limit from cgroup.
+	cgroupMemLimit, err := getCgroupMemoryLimit()
+	if err == nil && cgroupMemLimit < memLimit {
+		memLimit = cgroupMemLimit
 	}
+
 	if memLimit != lastMemoryLimit {
 		log.Info("set the memory limit", zap.Uint64("memLimit", memLimit))
 		metrics.MemoryLimit.Set(float64(memLimit))
 		lastMemoryLimit = memLimit
 	}
-	return nil
+	return err
 }
+
+var getCgroupCPUPeriodAndQuota = cgroup.GetCPUPeriodAndQuota
+var getCgroupMemoryLimit = cgroup.GetMemoryLimit

pkg/util/cgmon/cgmon_test.go

@@ -0,0 +1,41 @@
+// Copyright 2022 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cgmon
+
+import (
+	"errors"
+	"runtime"
+	"testing"
+
+	"github.com/shirou/gopsutil/v3/mem"
+	"github.com/stretchr/testify/require"
+)
+
+func TestUploadDefaultValueWithoutCgroup(t *testing.T) {
+	getCgroupCPUPeriodAndQuota = func() (period int64, quota int64, err error) {
+		return 0, 0, errors.New("mock error")
+	}
+	getCgroupMemoryLimit = func() (uint64, error) {
+		return 0, errors.New("mock error")
+	}
+
+	require.Error(t, refreshCgroupCPU())
+	require.Error(t, refreshCgroupMemory())
+
+	require.Equal(t, runtime.NumCPU(), lastCPU)
+	vmem, err := mem.VirtualMemory()
+	require.NoError(t, err)
+	require.Equal(t, vmem.Total, lastMemoryLimit)
+}