Skip to content

Commit

Permalink
enhance: Fix conflict complication error (milvus-io#38087)
Browse files Browse the repository at this point in the history
Related to milvus-io#37957 milvus-io#37989

Signed-off-by: Congqi Xia <[email protected]>
  • Loading branch information
congqixia authored Nov 29, 2024
1 parent 5e15276 commit 9d3035c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions internal/datacoord/compaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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")
Expand Down

0 comments on commit 9d3035c

Please sign in to comment.