From 0c4d82c6d3f17d9c81809b86991d661c5e7b1fe1 Mon Sep 17 00:00:00 2001 From: wayblink Date: Tue, 9 Jul 2024 10:22:13 +0800 Subject: [PATCH] fix: fix compaction task startTime is 0 (#34496) fix bug: #34497 #34498 --------- Signed-off-by: wayblink --- internal/datacoord/compaction.go | 2 -- internal/datacoord/compaction_trigger_v2.go | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/datacoord/compaction.go b/internal/datacoord/compaction.go index 20ea91811d79..3991b8b2f223 100644 --- a/internal/datacoord/compaction.go +++ b/internal/datacoord/compaction.go @@ -164,7 +164,6 @@ func (c *compactionPlanHandler) getCompactionTasksNumBySignalID(triggerID int64) } // if t.GetPlanID() } - cnt += len(c.queueTasks) c.mu.RUnlock() c.executingMu.RLock() for _, t := range c.executingTasks { @@ -172,7 +171,6 @@ func (c *compactionPlanHandler) getCompactionTasksNumBySignalID(triggerID int64) cnt += 1 } } - cnt += len(c.queueTasks) c.executingMu.RUnlock() return cnt } diff --git a/internal/datacoord/compaction_trigger_v2.go b/internal/datacoord/compaction_trigger_v2.go index 76a01509e9b0..08dc697e6e07 100644 --- a/internal/datacoord/compaction_trigger_v2.go +++ b/internal/datacoord/compaction_trigger_v2.go @@ -230,6 +230,7 @@ func (m *CompactionTriggerManager) SubmitL0ViewToScheduler(ctx context.Context, TriggerID: taskID, // inner trigger, use task id as trigger id PlanID: taskID, Type: datapb.CompactionType_Level0DeleteCompaction, + StartTime: time.Now().UnixMilli(), InputSegments: levelZeroSegs, State: datapb.CompactionTaskState_pipelining, Channel: view.GetGroupLabel().Channel, @@ -271,7 +272,7 @@ func (m *CompactionTriggerManager) SubmitClusteringViewToScheduler(ctx context.C PlanID: taskID, TriggerID: view.(*ClusteringSegmentsView).triggerID, State: datapb.CompactionTaskState_pipelining, - StartTime: int64(view.(*ClusteringSegmentsView).compactionTime.startTime), + StartTime: time.Now().UnixMilli(), CollectionTtl: view.(*ClusteringSegmentsView).compactionTime.collectionTTL.Nanoseconds(), TimeoutInSeconds: Params.DataCoordCfg.ClusteringCompactionTimeoutInSeconds.GetAsInt32(), Type: datapb.CompactionType_ClusteringCompaction,