From 9dc98ac76dc99b1b7d8d3be4eb422d856f11aecf Mon Sep 17 00:00:00 2001 From: wayblink Date: Thu, 11 Jul 2024 17:43:43 +0800 Subject: [PATCH] enhance: [cherry-pick] Refine clustering compaction latency metrics (#34539) issue: #34527 pr: #34528 Signed-off-by: wayblink --- internal/datacoord/compaction_task_clustering.go | 7 +++---- pkg/metrics/datacoord_metrics.go | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/datacoord/compaction_task_clustering.go b/internal/datacoord/compaction_task_clustering.go index 0d1acd61ff..822a9ea56d 100644 --- a/internal/datacoord/compaction_task_clustering.go +++ b/internal/datacoord/compaction_task_clustering.go @@ -35,7 +35,6 @@ import ( "github.com/milvus-io/milvus/pkg/metrics" "github.com/milvus-io/milvus/pkg/util/merr" "github.com/milvus-io/milvus/pkg/util/metautil" - "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/milvus-io/milvus/pkg/util/typeutil" ) @@ -78,16 +77,16 @@ func (t *clusteringCompactionTask) Process() bool { lastStateDuration := ts - t.GetLastStateStartTime() log.Info("clustering compaction task state changed", zap.String("lastState", lastState), zap.String("currentState", currentState), zap.Int64("elapse", lastStateDuration)) metrics.DataCoordCompactionLatency. - WithLabelValues(fmt.Sprint(typeutil.IsVectorType(t.GetClusteringKeyField().DataType)), datapb.CompactionType_ClusteringCompaction.String(), lastState). + WithLabelValues(fmt.Sprint(typeutil.IsVectorType(t.GetClusteringKeyField().DataType)), fmt.Sprint(t.CollectionID), t.Channel, datapb.CompactionType_ClusteringCompaction.String(), lastState). Observe(float64(lastStateDuration)) t.updateAndSaveTaskMeta(setRetryTimes(0), setLastStateStartTime(ts)) if t.State == datapb.CompactionTaskState_completed { t.updateAndSaveTaskMeta(setEndTime(ts)) - elapse := ts - tsoutil.PhysicalTime(uint64(t.StartTime)).UnixMilli() + elapse := ts - t.StartTime log.Info("clustering compaction task total elapse", zap.Int64("elapse", elapse)) metrics.DataCoordCompactionLatency. - WithLabelValues(fmt.Sprint(typeutil.IsVectorType(t.GetClusteringKeyField().DataType)), datapb.CompactionType_ClusteringCompaction.String(), "total"). + WithLabelValues(fmt.Sprint(typeutil.IsVectorType(t.GetClusteringKeyField().DataType)), fmt.Sprint(t.CollectionID), t.Channel, datapb.CompactionType_ClusteringCompaction.String(), "total"). Observe(float64(elapse)) } } diff --git a/pkg/metrics/datacoord_metrics.go b/pkg/metrics/datacoord_metrics.go index d39fa2c7e7..36338eeb84 100644 --- a/pkg/metrics/datacoord_metrics.go +++ b/pkg/metrics/datacoord_metrics.go @@ -202,6 +202,8 @@ var ( Buckets: longTaskBuckets, }, []string{ isVectorFieldLabelName, + collectionIDLabelName, + channelNameLabelName, compactionTypeLabelName, stageLabelName, })