fix: make the entity num metric accurate

Signed-off-by: yah01 <yang.cen@zilliz.com>
milvus-io · Jan 5, 2024 · 889121d · 889121d
1 parent 1c1f2a1
commit 889121d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 20 deletions.
diff --git a/internal/querynodev2/delegator/delegator_data_test.go b/internal/querynodev2/delegator/delegator_data_test.go
@@ -911,7 +911,7 @@ func (s *DelegatorDataSuite) TestSyncTargetVersion() {
 		ms.EXPECT().Type().Return(segments.SegmentTypeGrowing)
 		ms.EXPECT().Collection().Return(1)
 		ms.EXPECT().Partition().Return(1)
-		ms.EXPECT().RowNum().Return(0)
+		ms.EXPECT().InsertCount().Return(0)
 		ms.EXPECT().Indexes().Return(nil)
 		ms.EXPECT().Shard().Return(s.vchannelName)
 		ms.EXPECT().Level().Return(datapb.SegmentLevel_L1)

diff --git a/internal/querynodev2/segments/manager.go b/internal/querynodev2/segments/manager.go
@@ -202,15 +202,14 @@ func (mgr *segmentManager) Put(segmentType SegmentType, segments ...Segment) {
 			fmt.Sprint(len(segment.Indexes())),
 			segment.Level().String(),
 		).Inc()
-		if segment.RowNum() > 0 {
-			metrics.QueryNodeNumEntities.WithLabelValues(
-				fmt.Sprint(paramtable.GetNodeID()),
-				fmt.Sprint(segment.Collection()),
-				fmt.Sprint(segment.Partition()),
-				segment.Type().String(),
-				fmt.Sprint(len(segment.Indexes())),
-			).Add(float64(segment.RowNum()))
-		}
+
+		metrics.QueryNodeNumEntities.WithLabelValues(
+			fmt.Sprint(paramtable.GetNodeID()),
+			fmt.Sprint(segment.Collection()),
+			fmt.Sprint(segment.Partition()),
+			segment.Type().String(),
+			fmt.Sprint(len(segment.Indexes())),
+		).Add(float64(segment.InsertCount()))
 	}
 	mgr.updateMetric()
 
@@ -556,7 +555,6 @@ func (mgr *segmentManager) updateMetric() {
 }
 
 func remove(segment Segment) bool {
-	rowNum := segment.RowNum()
 	segment.Release()
 
 	metrics.QueryNodeNumSegments.WithLabelValues(
@@ -567,14 +565,13 @@ func remove(segment Segment) bool {
 		fmt.Sprint(len(segment.Indexes())),
 		segment.Level().String(),
 	).Dec()
-	if rowNum > 0 {
-		metrics.QueryNodeNumEntities.WithLabelValues(
-			fmt.Sprint(paramtable.GetNodeID()),
-			fmt.Sprint(segment.Collection()),
-			fmt.Sprint(segment.Partition()),
-			segment.Type().String(),
-			fmt.Sprint(len(segment.Indexes())),
-		).Sub(float64(rowNum))
-	}
+
+	metrics.QueryNodeNumEntities.WithLabelValues(
+		fmt.Sprint(paramtable.GetNodeID()),
+		fmt.Sprint(segment.Collection()),
+		fmt.Sprint(segment.Partition()),
+		segment.Type().String(),
+		fmt.Sprint(len(segment.Indexes())),
+	).Sub(float64(segment.InsertCount()))
 	return true
 }