mirror of
https://gitee.com/milvus-io/milvus.git
synced 2026-01-07 19:31:51 +08:00
enhance: Fix conflict complication error (#38087)
Related to #37957 #37989 Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>
This commit is contained in:
parent
5e152767a3
commit
9d3035c8ab
@ -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")
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user