resolve comment

Author: FouoF

pkg/device/nvidia/device.go

@@ -610,7 +610,7 @@ func fitQuota(tmpDevs map[string]device.ContainerDevices, ns string, memreq int6
 		mem += int64(val.Usedmem)
 		core += int64(val.Usedcores)
 	}
-	klog.Infoln("Allocating...", mem, "cores", core)
+	klog.V(4).Infoln("Allocating...", mem, "cores", core)
 	return device.GetLocalCache().FitQuota(ns, mem, core, NvidiaGPUDevice)
 }
 

pkg/device/quota.go

@@ -42,13 +42,13 @@ func GetLocalCache() *QuotaManager {
 	return &localCache
 }
 
+var once sync.Once
 func NewQuotaManager() *QuotaManager {
-	if localCache.Quotas != nil {
-		return &localCache
-	}
-	localCache = QuotaManager{
-		Quotas: make(map[string]*DeviceQuota),
-	}
+	once.Do(func() {
+		localCache = QuotaManager{
+			Quotas: make(map[string]*DeviceQuota),
+		}
+	})
 	return &localCache
 }
 
@@ -68,15 +68,15 @@ func (q *QuotaManager) FitQuota(ns string, memreq int64, coresreq int64, deviceN
 	coreResourceName := resourceNames.ResourceCoreName
 	_, ok = (*dq)[memResourceName]
 	if ok {
-		klog.InfoS("resourceMem quota judging", "limit", (*dq)[memResourceName].Limit, "used", (*dq)[memResourceName].Used, "alloc", memreq)
+		klog.V(4).InfoS("resourceMem quota judging", "limit", (*dq)[memResourceName].Limit, "used", (*dq)[memResourceName].Used, "alloc", memreq)
 		if (*dq)[memResourceName].Limit != 0 && (*dq)[memResourceName].Used+memreq > (*dq)[memResourceName].Limit {
-			klog.InfoS("resourceMem quota not fitted", "limit", (*dq)[memResourceName].Limit, "used", (*dq)[memResourceName].Used, "alloc", memreq)
+			klog.V(4).InfoS("resourceMem quota not fitted", "limit", (*dq)[memResourceName].Limit, "used", (*dq)[memResourceName].Used, "alloc", memreq)
 			return false
 		}
 	}
 	_, ok = (*dq)[coreResourceName]
 	if ok && (*dq)[coreResourceName].Limit != 0 && (*dq)[coreResourceName].Used+coresreq > (*dq)[coreResourceName].Limit {
-		klog.InfoS("resourceCores quota not fitted", "limit", (*dq)[coreResourceName].Limit, "used", (*dq)[coreResourceName].Used, "alloc", memreq)
+		klog.V(4).InfoS("resourceCores quota not fitted", "limit", (*dq)[coreResourceName].Limit, "used", (*dq)[coreResourceName].Used, "alloc", memreq)
 		return false
 	}
 	return true
@@ -133,7 +133,7 @@ func (q *QuotaManager) AddUsage(pod *corev1.Pod, podDev PodDevices) {
 	}
 	for _, val := range q.Quotas {
 		for idx, val1 := range *val {
-			klog.Infoln("add usage val=", idx, ":", val1)
+			klog.V(4).Infoln("add usage val=", idx, ":", val1)
 		}
 	}
 }
@@ -157,7 +157,7 @@ func (q *QuotaManager) RmUsage(pod *corev1.Pod, podDev PodDevices) {
 	}
 	for _, val := range q.Quotas {
 		for idx, val1 := range *val {
-			klog.Infoln("after val=", idx, ":", val1)
+			klog.V(4).Infoln("after val=", idx, ":", val1)
 		}
 	}
 }
@@ -181,10 +181,10 @@ func (q *QuotaManager) AddQuota(quota *corev1.ResourceQuota) {
 	for idx, val := range quota.Spec.Hard {
 		value, ok := val.AsInt64()
 		if ok {
-			if len(idx.String()) <= len("limits.") {
+			if !strings.HasPrefix(idx.String(), "limits.") {
 				continue
 			}
-			dn := idx.String()[len("limits."):]
+			dn := strings.TrimPrefix(idx.String(), "limits.")
 			if !IsManagedQuota(dn) {
 				continue
 			}
@@ -200,12 +200,12 @@ func (q *QuotaManager) AddQuota(quota *corev1.ResourceQuota) {
 				}
 			}
 			(*dp)[dn].Limit = value
-			klog.InfoS("quota set:", "idx=", idx, "val", value)
+			klog.V(4).InfoS("quota set:", "idx=", idx, "val", value)
 		}
 	}
 	for _, val := range q.Quotas {
 		for idx, val1 := range *val {
-			klog.Infoln("after val=", idx, ":", val1)
+			klog.V(4).Infoln("after val=", idx, ":", val1)
 		}
 	}
 }
@@ -223,13 +223,17 @@ func (q *QuotaManager) DelQuota(quota *corev1.ResourceQuota) {
 			if !IsManagedQuota(dn) {
 				continue
 			}
-			klog.InfoS("quota remove:", "idx=", idx, "val", value)
-			(*q.Quotas[quota.Namespace])[dn].Limit = 0
+			klog.V(4).InfoS("quota remove:", "idx=", idx, "val", value)
+			if dq, ok := q.Quotas[quota.Namespace]; ok {
+				if quotaInfo, ok := (*dq)[dn]; ok {
+					quotaInfo.Limit = 0
+				}
+			}
 		}
 	}
 	for _, val := range q.Quotas {
 		for idx, val1 := range *val {
-			klog.Infoln("after val=", idx, ":", val1)
+			klog.V(4).Infoln("after val=", idx, ":", val1)
 		}
 	}
 

pkg/scheduler/scheduler.go

@@ -121,8 +121,6 @@ func (s *Scheduler) onDelPod(obj any) {
 	if !ok {
 		return
 	}
-	s.podManager.mutex.Lock()
-	defer s.podManager.mutex.Unlock()
 	pi, ok := s.pods[pod.UID]
 	if ok {
 		s.quotaManager.RmUsage(pod, pi.Devices)