Merge pull request kubernetes#77656 from yastij/check-cstat-mem

k8s-ci-robot · web-flow · commit ef9e794a369d · 2019-05-09T17:52:23.000-07:00
check if Memory is not nil for container stats
diff --git a/pkg/kubelet/stats/helper.go b/pkg/kubelet/stats/helper.go
@@ -51,7 +51,7 @@ func cadvisorInfoToCPUandMemoryStats(info *cadvisorapiv2.ContainerInfo) (*statsa
 			cpuStats.UsageCoreNanoSeconds = &cstat.Cpu.Usage.Total
 		}
 	}
-	if info.Spec.HasMemory {
+	if info.Spec.HasMemory && cstat.Memory != nil {
 		pageFaults := cstat.Memory.ContainerData.Pgfault
 		majorPageFaults := cstat.Memory.ContainerData.Pgmajfault
 		memoryStats = &statsapi.MemoryStats{

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func cadvisorInfoToCPUandMemoryStats(info cadvisorapiv2.ContainerInfo) (statsa`
`51`	`51`	`cpuStats.UsageCoreNanoSeconds = &cstat.Cpu.Usage.Total`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`- if info.Spec.HasMemory {`
	`54`	`+ if info.Spec.HasMemory && cstat.Memory != nil {`
`55`	`55`	`pageFaults := cstat.Memory.ContainerData.Pgfault`
`56`	`56`	`majorPageFaults := cstat.Memory.ContainerData.Pgmajfault`
`57`	`57`	`memoryStats = &statsapi.MemoryStats{`