From 9d3035c8ab74be1f6abd4cd1901dfc56e8acc96a Mon Sep 17 00:00:00 2001 From: congqixia Date: Fri, 29 Nov 2024 12:00:36 +0800 Subject: [PATCH] enhance: Fix conflict complication error (#38087) Related to #37957 #37989 Signed-off-by: Congqi Xia --- internal/datacoord/compaction.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/datacoord/compaction.go b/internal/datacoord/compaction.go index 51b29fc7c8..7368c36b56 100644 --- a/internal/datacoord/compaction.go +++ b/internal/datacoord/compaction.go @@ -358,7 +358,7 @@ func (c *compactionPlanHandler) loadMeta() { zap.Error(err), ) // ignore the drop error - c.meta.DropCompactionTask(task) + c.meta.DropCompactionTask(context.Background(), task) continue } log.Info("compactionPlanHandler loadMeta submitTask", @@ -611,7 +611,7 @@ func (c *compactionPlanHandler) enqueueCompaction(task *datapb.CompactionTask) e } if err = c.submitTask(t); err != nil { log.Warn("submit compaction task failed", zap.Error(err)) - c.meta.SetSegmentsCompacting(t.GetTaskProto().GetInputSegments(), false) + c.meta.SetSegmentsCompacting(context.Background(), t.GetTaskProto().GetInputSegments(), false) return err } log.Info("Compaction plan submitted")