Merge pull request #268 from sunya-ch/reader-1

handle inactive pods with inactive threshold

Author: rootfs

pkg/collector/reader.go

@@ -54,6 +54,8 @@ type CgroupTime struct {
 const (
 	samplePeriodSec = 3
 	samplePeriod    = samplePeriodSec * 1000 * time.Millisecond
+
+	maxInactivePods = 10
 )
 
 var (
@@ -197,12 +199,7 @@ func (c *Collector) readBPFEvent() (pidPodName map[uint32]string, containerIDPod
 		}
 	}
 	c.resetBPFTables()
-	// clean podEnergy
-	for podName := range podEnergy {
-		if _, found := foundPod[podName]; !found {
-			delete(podEnergy, podName)
-		}
-	}
+	handleInactivePods(foundPod)
 	return pidPodName, containerIDPodName
 }
 
@@ -397,3 +394,20 @@ func getActiveCPUs(cpuTime *[C.CPU_VECTOR_SIZE]uint16) (activeCPUs []int32) {
 	}
 	return
 }
+
+// handleInactivePods
+func handleInactivePods(foundPod map[string]bool) {
+	numOfInactive := len(podEnergy) - len(foundPod)
+	if numOfInactive > maxInactivePods {
+		alivePods, err := podlister.GetAlivePods()
+		if err != nil {
+			klog.V(5).Infoln(err)
+			return
+		}
+		for podName := range podEnergy {
+			if _, found := alivePods[podName]; !found {
+				delete(podEnergy, podName)
+			}
+		}
+	}
+}

pkg/podlister/resolve_container.go

@@ -26,10 +26,9 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/sustainable-computing-io/kepler/pkg/config"
 	"golang.org/x/sys/unix"
 	"k8s.io/klog/v2"
-
-	"github.com/sustainable-computing-io/kepler/pkg/config"
 )
 
 type ContainerInfo struct {
@@ -284,3 +283,17 @@ func extractPodContainerIDfromPath(path string) (string, error) {
 	}
 	return systemProcessName, fmt.Errorf("failed to find pod's container id")
 }
+
+// GetAlivePods returns alive pod map
+func GetAlivePods() (map[string]bool, error) {
+	pods, err := podLister.ListPods()
+	alivePods := make(map[string]bool)
+	if err != nil {
+		return alivePods, err
+	}
+	for i := 0; i < len(*pods); i++ {
+		podName := (*pods)[i].Name
+		alivePods[podName] = true
+	}
+	return alivePods, nil
+}