Merge pull request #650 from chenkaiyue/memory-metric-lose-crash

Fix crash when memory metric can't be collected
gocrane · Dec 15, 2022 · b8415e8 · b8415e8
2 parents 2fcdce0 + 403a15a
commit b8415e8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/ensurance/collector/cadvisor/cadvisor_linux.go b/pkg/ensurance/collector/cadvisor/cadvisor_linux.go
@@ -164,8 +164,10 @@ func (c *CadvisorCollector) Collect() (map[string][]common.TimeSeries, error) {
 
 			hasExtRes := hasExtCpuRes || hasExtMemRes
 			var containerLabels = GetContainerLabels(pod, containerId, containerName, hasExtRes)
-			addSampleToStateMap(types.MetricNameContainerMemTotalUsage, composeSample(containerLabels, float64(v.Stats[0].Memory.WorkingSet), now), stateMap)
-			klog.V(6).Infof("Pod: %s, containerName: %s, key %s, container_mem_total_usage %#v", klog.KObj(pod), containerName, key, float64(v.Stats[0].Memory.WorkingSet))
+			if v.Stats[0].Memory != nil {
+				addSampleToStateMap(types.MetricNameContainerMemTotalUsage, composeSample(containerLabels, float64(v.Stats[0].Memory.WorkingSet), now), stateMap)
+				klog.V(6).Infof("Pod: %s, containerName: %s, key %s, container_mem_total_usage %#v", klog.KObj(pod), containerName, key, float64(v.Stats[0].Memory.WorkingSet))
+			}
 
 			if state, ok := c.latestContainersStates[key]; ok {
 				klog.V(6).Infof("For key %s, LatestContainersStates exist", key)