admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-08 10:08:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: make the entity num metric accurate (#29643)

Browse Source 
fix #29642

Signed-off-by: yah01 <yang.cen@zilliz.com>
This commit is contained in:
yah01 2024-01-05 18:24:47 +08:00 committed by GitHub
parent 23183ffb0f
commit a0cec4047a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/querynodev2/delegator/delegator_data_test.go
View File

@ -911,7 +911,7 @@ func (s *DelegatorDataSuite) TestSyncTargetVersion() {
ms.EXPECT().Type().Return(segments.SegmentTypeGrowing) ms.EXPECT().Type().Return(segments.SegmentTypeGrowing)
ms.EXPECT().Collection().Return(1) ms.EXPECT().Collection().Return(1)
ms.EXPECT().Partition().Return(1) ms.EXPECT().Partition().Return(1)
ms.EXPECT().RowNum().Return(0) ms.EXPECT().InsertCount().Return(0)
ms.EXPECT().Indexes().Return(nil) ms.EXPECT().Indexes().Return(nil)
ms.EXPECT().Shard().Return(s.vchannelName) ms.EXPECT().Shard().Return(s.vchannelName)
ms.EXPECT().Level().Return(datapb.SegmentLevel_L1) ms.EXPECT().Level().Return(datapb.SegmentLevel_L1)

35
internal/querynodev2/segments/manager.go
View File

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