Include change in cri server

jsturtevant · jsturtevant · commit 3658d5b403bb · 2024-09-03T18:04:03.000Z
Signed-off-by: James Sturtevant &lt;jstur@microsoft.com&gt;
diff --git a/pkg/cri/server/container_stats_list.go b/pkg/cri/server/container_stats_list.go
@@ -122,6 +122,11 @@ func (c *criService) getUsageNanoCores(containerID string, isSandbox bool, curre
 		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) /
 		float64(nanoSeconds) * float64(time.Second/time.Nanosecond))
 
diff --git a/pkg/cri/server/container_stats_list_test.go b/pkg/cri/server/container_stats_list_test.go
@@ -27,48 +27,58 @@ import (
 func TestContainerMetricsCPUNanoCoreUsage(t *testing.T) {
 	c := newTestCRIService()
 	timestamp := time.Now()
-	secondAfterTimeStamp := timestamp.Add(time.Second)
-	ID := "ID"
+	tenSecondAftertimeStamp := timestamp.Add(time.Second * 10)
 
 	for desc, test := range map[string]struct {
+		id                          string
+		desc                        string
 		firstCPUValue               uint64
 		secondCPUValue              uint64
 		expectedNanoCoreUsageFirst  uint64
 		expectedNanoCoreUsageSecond uint64
 	}{
 		"metrics": {
+			id:                          "id1",
+			desc:                        "metrics",
 			firstCPUValue:               50,
 			secondCPUValue:              500,
 			expectedNanoCoreUsageFirst:  0,
-			expectedNanoCoreUsageSecond: 450,
+			expectedNanoCoreUsageSecond: 45,
+		},
+		"no metrics in second CPU sample": {
+			id:                          "id2",
+			desc:                        "metrics",
+			firstCPUValue:               234235,
+			secondCPUValue:              0,
+			expectedNanoCoreUsageFirst:  0,
+			expectedNanoCoreUsageSecond: 0,
 		},
 	} {
 		t.Run(desc, func(t *testing.T) {
 			container, err := containerstore.NewContainer(
-				containerstore.Metadata{ID: ID},
+				containerstore.Metadata{ID: test.id},
 			)
 			assert.NoError(t, err)
 			assert.Nil(t, container.Stats)
 			err = c.containerStore.Add(container)
 			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)
 
-			container, err = c.containerStore.Get(ID)
+			container, err = c.containerStore.Get(test.id)
 			assert.NoError(t, err)
 			assert.NotNil(t, container.Stats)
 
 			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.Equal(t, test.expectedNanoCoreUsageSecond, cpuUsage)
 
-			container, err = c.containerStore.Get(ID)
+			container, err = c.containerStore.Get(test.id)
 			assert.NoError(t, err)
 			assert.NotNil(t, container.Stats)
 		})
 	}
-
 }
