admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-08 01:58:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: modify retry error (#32351)

Browse Source 
#32322

Signed-off-by: luzhang <luzhang@zilliz.com>
Co-authored-by: luzhang <luzhang@zilliz.com>
This commit is contained in:
zhagnlu 2024-04-18 14:25:14 +08:00 committed by GitHub
parent 70beec3e47
commit e2c38750c7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/datacoord/handler.go
View File

@ -397,7 +397,7 @@ func (h *ServerHandler) GetCollection(ctx context.Context, collectionID UniqueID
ctx2, cancel := context.WithTimeout(ctx, time.Second*10) ctx2, cancel := context.WithTimeout(ctx, time.Second*10)
defer cancel() defer cancel()
if err := retry.Do(ctx2, func() error { if err := retry.Do(ctx2, func() error {
err := h.s.loadCollectionFromRootCoord(ctx, collectionID) err := h.s.loadCollectionFromRootCoord(ctx2, collectionID)
if err != nil { if err != nil {
log.Warn("failed to load collection from rootcoord", zap.Int64("collectionID", collectionID), zap.Error(err)) log.Warn("failed to load collection from rootcoord", zap.Int64("collectionID", collectionID), zap.Error(err))
return err return err
@ -407,6 +407,7 @@ func (h *ServerHandler) GetCollection(ctx context.Context, collectionID UniqueID
log.Ctx(ctx2).Warn("datacoord ServerHandler GetCollection finally failed", log.Ctx(ctx2).Warn("datacoord ServerHandler GetCollection finally failed",
zap.Int64("collectionID", collectionID), zap.Int64("collectionID", collectionID),
zap.Error(err)) zap.Error(err))
return nil, err
} }
return h.s.meta.GetCollection(collectionID), nil return h.s.meta.GetCollection(collectionID), nil

8
internal/datacoord/services.go
View File

@ -194,7 +194,13 @@ func (s *Server) AssignSegmentID(ctx context.Context, req *datapb.AssignSegmentI
r.CollectionID, r.PartitionID, r.ChannelName, int64(r.Count)) r.CollectionID, r.PartitionID, r.ChannelName, int64(r.Count))
if err != nil { if err != nil {
log.Warn("failed to alloc segment", zap.Any("request", r), zap.Error(err)) log.Warn("failed to alloc segment", zap.Any("request", r), zap.Error(err))
return nil, err assigns = append(assigns, &datapb.SegmentIDAssignment{
ChannelName: r.ChannelName,
CollectionID: r.CollectionID,
PartitionID: r.PartitionID,
Status: merr.Status(err),
})
continue
} }
log.Info("success to assign segments", zap.Int64("collectionID", r.GetCollectionID()), zap.Any("assignments", segmentAllocations)) log.Info("success to assign segments", zap.Int64("collectionID", r.GetCollectionID()), zap.Any("assignments", segmentAllocations))

2
internal/datacoord/services_test.go
View File

@ -950,7 +950,7 @@ func (s *ServerSuite) TestAssignSegmentID() {
SegmentIDRequests: []*datapb.SegmentIDRequest{req}, SegmentIDRequests: []*datapb.SegmentIDRequest{req},
}) })
s.NoError(err) s.NoError(err)
s.EqualValues(0, len(resp.SegIDAssignments)) s.EqualValues(1, len(resp.SegIDAssignments))
}) })
} }