mirror of
https://gitee.com/milvus-io/milvus.git
synced 2025-12-08 01:58:34 +08:00
fix: Return err for conc.Future in sync manager (#31790)
Should not return `err, nil` when using conc.Future, as the error will be lost/ignored when using `AwaitAll` to wait for the future. issue: https://github.com/milvus-io/milvus/issues/31788 Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
This commit is contained in:
parent
23ba2a5388
commit
d6cdcf74db
@ -127,7 +127,7 @@ func (mgr *syncManager) safeSubmitTask(task Task) *conc.Future[error] {
|
|||||||
for {
|
for {
|
||||||
targetID, err := task.CalcTargetSegment()
|
targetID, err := task.CalcTargetSegment()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err, nil
|
return err, err
|
||||||
}
|
}
|
||||||
log.Info("task calculated target segment id",
|
log.Info("task calculated target segment id",
|
||||||
zap.Int64("targetID", targetID),
|
zap.Int64("targetID", targetID),
|
||||||
@ -142,7 +142,7 @@ func (mgr *syncManager) safeSubmitTask(task Task) *conc.Future[error] {
|
|||||||
log.Info("target updated during submitting", zap.Error(err))
|
log.Info("target updated during submitting", zap.Error(err))
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
return err, nil
|
return err, err
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user