github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #8951 from kiashok/exposeCommitMemWindows

Browse Source 
Populate commit memory for windows memory usage stats
This commit is contained in:
Derek McGowan 2023-08-21 15:42:34 -07:00 committed by GitHub
commit b8f32e863c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 78 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/cri/sbserver/sandbox_stats_windows.go
View File

@ -222,10 +222,11 @@ func appendMemoryPodStats(podRuntimeStats *runtime.WindowsContainerStats, contai
// HostProcess pods are an example where there is no actual pod sandbox running and therefor no stats // HostProcess pods are an example where there is no actual pod sandbox running and therefor no stats
if podRuntimeStats.Memory == nil { if podRuntimeStats.Memory == nil {
podRuntimeStats.Memory = &runtime.WindowsMemoryUsage{ podRuntimeStats.Memory = &runtime.WindowsMemoryUsage{
Timestamp: timestamp.UnixNano(), Timestamp: timestamp.UnixNano(),
WorkingSetBytes: &runtime.UInt64Value{Value: 0}, WorkingSetBytes: &runtime.UInt64Value{Value: 0},
AvailableBytes: &runtime.UInt64Value{Value: 0}, AvailableBytes: &runtime.UInt64Value{Value: 0},
PageFaults: &runtime.UInt64Value{Value: 0}, PageFaults: &runtime.UInt64Value{Value: 0},
CommitMemoryBytes: &runtime.UInt64Value{Value: 0},
} }
} }
@ -294,6 +295,9 @@ func (c *criService) convertToCRIStats(stats *wstats.Statistics) (*runtime.Windo
WorkingSetBytes: &runtime.UInt64Value{ WorkingSetBytes: &runtime.UInt64Value{
Value: wstats.Memory.MemoryUsagePrivateWorkingSetBytes, Value: wstats.Memory.MemoryUsagePrivateWorkingSetBytes,
}, },
CommitMemoryBytes: &runtime.UInt64Value{
Value: wstats.Memory.MemoryUsageCommitBytes,
},
} }
} }

45
pkg/cri/sbserver/sandbox_stats_windows_test.go
View File

@ -88,6 +88,7 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds uint64 UsageCoreNanoSeconds uint64
UsageNanoCores uint64 UsageNanoCores uint64
WorkingSetBytes uint64 WorkingSetBytes uint64
CommitMemoryBytes uint64
} }
for _, test := range []struct { for _, test := range []struct {
desc string desc string
@ -111,10 +112,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will include the container stats", desc: "pod stats will include the container stats",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -125,12 +126,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -139,13 +142,13 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will include the init container stats", desc: "pod stats will include the init container stats",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"i1": { "i1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -157,17 +160,20 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 600, UsageCoreNanoSeconds: 600,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 60, WorkingSetBytes: 60,
CommitMemoryBytes: 60,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -176,10 +182,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will not include the init container stats if it is stopped", desc: "pod stats will not include the init container stats if it is stopped",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -191,12 +197,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -205,10 +213,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will not include the init container stats if it is stopped in failed state", desc: "pod stats will not include the init container stats if it is stopped in failed state",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -220,12 +228,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -234,10 +244,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod with existing stats will have usagenanocores totalled across pods and containers", desc: "pod with existing stats will have usagenanocores totalled across pods and containers",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
}, },
sandbox: sandboxPod("s1", initialStatsTimestamp, 400), sandbox: sandboxPod("s1", initialStatsTimestamp, 400),
@ -251,12 +261,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 800, UsageCoreNanoSeconds: 800,
UsageNanoCores: 400, UsageNanoCores: 400,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -265,7 +277,7 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod sandbox with nil stats still works (hostprocess container scenario)", desc: "pod sandbox with nil stats still works (hostprocess container scenario)",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
"s1": nil, "s1": nil,
}, },
@ -280,12 +292,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -294,7 +308,7 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod sandbox with empty stats still works (hostprocess container scenario)", desc: "pod sandbox with empty stats still works (hostprocess container scenario)",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
"s1": {}, "s1": {},
}, },
@ -309,12 +323,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -382,7 +398,7 @@ func sandboxPod(id string, timestamp time.Time, cachedCPU uint64) sandboxstore.S
}} }}
} }
func windowsStat(timestamp time.Time, cpu uint64, memory uint64) *wstats.Statistics_Windows { func windowsStat(timestamp time.Time, cpu uint64, memory uint64, commitMemory uint64) *wstats.Statistics_Windows {
return &wstats.Statistics_Windows{ return &wstats.Statistics_Windows{
Windows: &wstats.WindowsContainerStatistics{ Windows: &wstats.WindowsContainerStatistics{
Timestamp: protobuf.ToTimestamp(timestamp), Timestamp: protobuf.ToTimestamp(timestamp),
@ -391,6 +407,7 @@ func windowsStat(timestamp time.Time, cpu uint64, memory uint64) *wstats.Statist
}, },
Memory: &wstats.WindowsContainerMemoryStatistics{ Memory: &wstats.WindowsContainerMemoryStatistics{
MemoryUsagePrivateWorkingSetBytes: memory, MemoryUsagePrivateWorkingSetBytes: memory,
MemoryUsageCommitBytes: commitMemory,
}, },
}, },
} }

12
pkg/cri/server/sandbox_stats_windows.go
View File

@ -222,10 +222,11 @@ func appendMemoryPodStats(podRuntimeStats *runtime.WindowsContainerStats, contai
// HostProcess pods are an example where there is no actual pod sandbox running and therefor no stats // HostProcess pods are an example where there is no actual pod sandbox running and therefor no stats
if podRuntimeStats.Memory == nil { if podRuntimeStats.Memory == nil {
podRuntimeStats.Memory = &runtime.WindowsMemoryUsage{ podRuntimeStats.Memory = &runtime.WindowsMemoryUsage{
Timestamp: timestamp.UnixNano(), Timestamp: timestamp.UnixNano(),
WorkingSetBytes: &runtime.UInt64Value{Value: 0}, WorkingSetBytes: &runtime.UInt64Value{Value: 0},
AvailableBytes: &runtime.UInt64Value{Value: 0}, AvailableBytes: &runtime.UInt64Value{Value: 0},
PageFaults: &runtime.UInt64Value{Value: 0}, PageFaults: &runtime.UInt64Value{Value: 0},
CommitMemoryBytes: &runtime.UInt64Value{Value: 0},
} }
} }
@ -294,6 +295,9 @@ func (c *criService) convertToCRIStats(stats *wstats.Statistics) (*runtime.Windo
WorkingSetBytes: &runtime.UInt64Value{ WorkingSetBytes: &runtime.UInt64Value{
Value: wstats.Memory.MemoryUsagePrivateWorkingSetBytes, Value: wstats.Memory.MemoryUsagePrivateWorkingSetBytes,
}, },
CommitMemoryBytes: &runtime.UInt64Value{
Value: wstats.Memory.MemoryUsageCommitBytes,
},
} }
} }

45
pkg/cri/server/sandbox_stats_windows_test.go
View File

@ -88,6 +88,7 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds uint64 UsageCoreNanoSeconds uint64
UsageNanoCores uint64 UsageNanoCores uint64
WorkingSetBytes uint64 WorkingSetBytes uint64
CommitMemoryBytes uint64
} }
for _, test := range []struct { for _, test := range []struct {
desc string desc string
@ -111,10 +112,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will include the container stats", desc: "pod stats will include the container stats",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -125,12 +126,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -139,13 +142,13 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will include the init container stats", desc: "pod stats will include the init container stats",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"i1": { "i1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -157,17 +160,20 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 600, UsageCoreNanoSeconds: 600,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 60, WorkingSetBytes: 60,
CommitMemoryBytes: 60,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -176,10 +182,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will not include the init container stats if it is stopped", desc: "pod stats will not include the init container stats if it is stopped",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -191,12 +197,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -205,10 +213,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod stats will not include the init container stats if it is stopped in failed state", desc: "pod stats will not include the init container stats if it is stopped in failed state",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 200, 20), Container: windowsStat(currentStatsTimestamp, 200, 20, 20),
}, },
}, },
sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}}, sandbox: sandboxstore.Sandbox{Metadata: sandboxstore.Metadata{ID: "s1"}},
@ -220,12 +228,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 200, UsageCoreNanoSeconds: 200,
UsageNanoCores: 0, UsageNanoCores: 0,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -234,10 +244,10 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod with existing stats will have usagenanocores totalled across pods and containers", desc: "pod with existing stats will have usagenanocores totalled across pods and containers",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
"s1": { "s1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
}, },
sandbox: sandboxPod("s1", initialStatsTimestamp, 400), sandbox: sandboxPod("s1", initialStatsTimestamp, 400),
@ -251,12 +261,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 800, UsageCoreNanoSeconds: 800,
UsageNanoCores: 400, UsageNanoCores: 400,
WorkingSetBytes: 40, WorkingSetBytes: 40,
CommitMemoryBytes: 40,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -265,7 +277,7 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod sandbox with nil stats still works (hostprocess container scenario)", desc: "pod sandbox with nil stats still works (hostprocess container scenario)",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
"s1": nil, "s1": nil,
}, },
@ -280,12 +292,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -294,7 +308,7 @@ func Test_criService_podSandboxStats(t *testing.T) {
desc: "pod sandbox with empty stats still works (hostprocess container scenario)", desc: "pod sandbox with empty stats still works (hostprocess container scenario)",
metrics: map[string]*wstats.Statistics{ metrics: map[string]*wstats.Statistics{
"c1": { "c1": {
Container: windowsStat(currentStatsTimestamp, 400, 20), Container: windowsStat(currentStatsTimestamp, 400, 20, 20),
}, },
"s1": {}, "s1": {},
}, },
@ -309,12 +323,14 @@ func Test_criService_podSandboxStats(t *testing.T) {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
expectedContainerStats: []expectedStats{ expectedContainerStats: []expectedStats{
{ {
UsageCoreNanoSeconds: 400, UsageCoreNanoSeconds: 400,
UsageNanoCores: 200, UsageNanoCores: 200,
WorkingSetBytes: 20, WorkingSetBytes: 20,
CommitMemoryBytes: 20,
}, },
}, },
expectError: false, expectError: false,
@ -382,7 +398,7 @@ func sandboxPod(id string, timestamp time.Time, cachedCPU uint64) sandboxstore.S
}} }}
} }
func windowsStat(timestamp time.Time, cpu uint64, memory uint64) *wstats.Statistics_Windows { func windowsStat(timestamp time.Time, cpu uint64, memory uint64, commitMemory uint64) *wstats.Statistics_Windows {
return &wstats.Statistics_Windows{ return &wstats.Statistics_Windows{
Windows: &wstats.WindowsContainerStatistics{ Windows: &wstats.WindowsContainerStatistics{
Timestamp: protobuf.ToTimestamp(timestamp), Timestamp: protobuf.ToTimestamp(timestamp),
@ -391,6 +407,7 @@ func windowsStat(timestamp time.Time, cpu uint64, memory uint64) *wstats.Statist
}, },
Memory: &wstats.WindowsContainerMemoryStatistics{ Memory: &wstats.WindowsContainerMemoryStatistics{
MemoryUsagePrivateWorkingSetBytes: memory, MemoryUsagePrivateWorkingSetBytes: memory,
MemoryUsageCommitBytes: commitMemory,
}, },
}, },
} }