mirrors/node-feature-discovery
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/node-feature-discovery.git synced 2024-12-14 11:57:51 +00:00
Code Activity

fix topology-updater cpu report

Browse source
This commit is contained in:
AllenXu93 2024-12-13 15:15:39 +08:00
parent 86d2809b77
commit a694d916df
1 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
pkg/resourcemonitor/podresourcesscanner.go
View file

@ -63,6 +63,11 @@ func (resMon *PodResourcesScanner) isWatchable(podNamespace string, podName stri
return false, false, err return false, false, err
} }
// Check Pod is guaranteed QOS class and has exclusive CPUs or devices
if pod.Status.QOSClass != corev1.PodQOSGuaranteed {
return false, false, nil
}
isIntegralGuaranteed := hasExclusiveCPUs(pod) isIntegralGuaranteed := hasExclusiveCPUs(pod)
if resMon.namespace == "*" && (isIntegralGuaranteed || hasDevice) { if resMon.namespace == "*" && (isIntegralGuaranteed || hasDevice) {
@ -85,9 +90,9 @@ func hasExclusiveCPUs(pod *corev1.Pod) bool {
continue continue
} }
totalCPU += cpuQuantity.Value() totalCPU += cpuQuantity.Value()
isInitContainerGuaranteed := hasIntegralCPUs(pod, &container) isInitContainerGuaranteed := hasIntegralCPUs(&container)
if !isInitContainerGuaranteed { if isInitContainerGuaranteed {
return false return true
} }
} }
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
@ -96,9 +101,9 @@ func hasExclusiveCPUs(pod *corev1.Pod) bool {
continue continue
} }
totalCPU += cpuQuantity.Value() totalCPU += cpuQuantity.Value()
isAppContainerGuaranteed := hasIntegralCPUs(pod, &container) isAppContainerGuaranteed := hasIntegralCPUs(&container)
if !isAppContainerGuaranteed { if isAppContainerGuaranteed {
return false return true
} }
} }
@ -107,7 +112,7 @@ func hasExclusiveCPUs(pod *corev1.Pod) bool {
} }
// hasIntegralCPUs returns true if a container in pod is requesting integral CPUs else returns false // hasIntegralCPUs returns true if a container in pod is requesting integral CPUs else returns false
func hasIntegralCPUs(pod *corev1.Pod, container *corev1.Container) bool { func hasIntegralCPUs(container *corev1.Container) bool {
cpuQuantity := container.Resources.Requests[corev1.ResourceCPU] cpuQuantity := container.Resources.Requests[corev1.ResourceCPU]
return cpuQuantity.Value()*1000 == cpuQuantity.MilliValue() return cpuQuantity.Value()*1000 == cpuQuantity.MilliValue()
} }
@ -147,7 +152,7 @@ func (resMon *PodResourcesScanner) Scan() (ScanResponse, error) {
for _, podResource := range respPodResources { for _, podResource := range respPodResources {
klog.InfoS("scanning pod", "podName", podResource.GetName()) klog.InfoS("scanning pod", "podName", podResource.GetName())
hasDevice := hasDevice(podResource) hasDevice := hasDevice(podResource)
isWatchable, isIntegralGuaranteed, err := resMon.isWatchable(podResource.GetNamespace(), podResource.GetName(), hasDevice) isWatchable, _, err := resMon.isWatchable(podResource.GetNamespace(), podResource.GetName(), hasDevice)
if err != nil { if err != nil {
return ScanResponse{}, fmt.Errorf("checking if pod in a namespace is watchable, namespace:%v, pod name %v: %w", podResource.GetNamespace(), podResource.GetName(), err) return ScanResponse{}, fmt.Errorf("checking if pod in a namespace is watchable, namespace:%v, pod name %v: %w", podResource.GetNamespace(), podResource.GetName(), err)
} }
@ -165,19 +170,17 @@ func (resMon *PodResourcesScanner) Scan() (ScanResponse, error) {
Name: container.Name, Name: container.Name,
} }
if isIntegralGuaranteed { cpuIDs := container.GetCpuIds()
cpuIDs := container.GetCpuIds() if len(cpuIDs) > 0 {
if len(cpuIDs) > 0 { var resCPUs []string
var resCPUs []string for _, cpuID := range container.GetCpuIds() {
for _, cpuID := range container.GetCpuIds() { resCPUs = append(resCPUs, strconv.FormatInt(cpuID, 10))
resCPUs = append(resCPUs, strconv.FormatInt(cpuID, 10)) }
} contRes.Resources = []ResourceInfo{
contRes.Resources = []ResourceInfo{ {
{ Name: corev1.ResourceCPU,
Name: corev1.ResourceCPU, Data: resCPUs,
Data: resCPUs, },
},
}
} }
} }