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

Cumulative stats can't decrease

Browse Source 
During removal of the container a stat value might be reported as zero; in this case the caluclation could end up with an extremely large number.  If the cumulative stat decreases report zero.

Signed-off-by: James Sturtevant <jstur@microsoft.com>
This commit is contained in:
James Sturtevant 2024-08-28 22:31:05 +00:00
parent 283149df7d
commit f6677a4ec5
No known key found for this signature in database
2 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/cri/server/container_stats_list.go
View File

@ -224,6 +224,11 @@ func (c *criService) getUsageNanoCores(containerID string, isSandbox bool, curre
return 0, nil return 0, nil
} }
// can't go backwards, this value might come in as 0 if the container was just removed
if currentUsageCoreNanoSeconds < oldStats.UsageCoreNanoSeconds {
return 0, nil
}
newUsageNanoCores := uint64(float64(currentUsageCoreNanoSeconds-oldStats.UsageCoreNanoSeconds) / newUsageNanoCores := uint64(float64(currentUsageCoreNanoSeconds-oldStats.UsageCoreNanoSeconds) /
float64(nanoSeconds) * float64(time.Second/time.Nanosecond)) float64(nanoSeconds) * float64(time.Second/time.Nanosecond))

25
internal/cri/server/container_stats_list_test.go
View File

@ -35,10 +35,10 @@ import (
func TestContainerMetricsCPUNanoCoreUsage(t *testing.T) { func TestContainerMetricsCPUNanoCoreUsage(t *testing.T) {
c := newTestCRIService() c := newTestCRIService()
timestamp := time.Now() timestamp := time.Now()
secondAfterTimeStamp := timestamp.Add(time.Second) tenSecondAftertimeStamp := timestamp.Add(time.Second * 10)
ID := "ID"
for _, test := range []struct { for _, test := range []struct {
id string
desc string desc string
firstCPUValue uint64 firstCPUValue uint64
secondCPUValue uint64 secondCPUValue uint64
@ -46,37 +46,46 @@ func TestContainerMetricsCPUNanoCoreUsage(t *testing.T) {
expectedNanoCoreUsageSecond uint64 expectedNanoCoreUsageSecond uint64
}{ }{
{ {
id: "id1",
desc: "metrics", desc: "metrics",
firstCPUValue: 50, firstCPUValue: 50,
secondCPUValue: 500, secondCPUValue: 500,
expectedNanoCoreUsageFirst: 0, expectedNanoCoreUsageFirst: 0,
expectedNanoCoreUsageSecond: 450, expectedNanoCoreUsageSecond: 45,
},
{
id: "id2",
desc: "metrics",
firstCPUValue: 234235,
secondCPUValue: 0,
expectedNanoCoreUsageFirst: 0,
expectedNanoCoreUsageSecond: 0,
}, },
} { } {
test := test test := test
t.Run(test.desc, func(t *testing.T) { t.Run(test.desc, func(t *testing.T) {
container, err := containerstore.NewContainer( container, err := containerstore.NewContainer(
containerstore.Metadata{ID: ID}, containerstore.Metadata{ID: test.id},
) )
assert.NoError(t, err) assert.NoError(t, err)
assert.Nil(t, container.Stats) assert.Nil(t, container.Stats)
err = c.containerStore.Add(container) err = c.containerStore.Add(container)
assert.NoError(t, err) assert.NoError(t, err)
cpuUsage, err := c.getUsageNanoCores(ID, false, test.firstCPUValue, timestamp) cpuUsage, err := c.getUsageNanoCores(test.id, false, test.firstCPUValue, timestamp)
assert.NoError(t, err) assert.NoError(t, err)
container, err = c.containerStore.Get(ID) container, err = c.containerStore.Get(test.id)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, container.Stats) assert.NotNil(t, container.Stats)
assert.Equal(t, test.expectedNanoCoreUsageFirst, cpuUsage) assert.Equal(t, test.expectedNanoCoreUsageFirst, cpuUsage)
cpuUsage, err = c.getUsageNanoCores(ID, false, test.secondCPUValue, secondAfterTimeStamp) cpuUsage, err = c.getUsageNanoCores(test.id, false, test.secondCPUValue, tenSecondAftertimeStamp)
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, test.expectedNanoCoreUsageSecond, cpuUsage) assert.Equal(t, test.expectedNanoCoreUsageSecond, cpuUsage)
container, err = c.containerStore.Get(ID) container, err = c.containerStore.Get(test.id)
assert.NoError(t, err) assert.NoError(t, err)
assert.NotNil(t, container.Stats) assert.NotNil(t, container.Stats)
}) })