diff --git a/internal/datacoord/server_test.go b/internal/datacoord/server_test.go index cafcb7c52a..253622317a 100644 --- a/internal/datacoord/server_test.go +++ b/internal/datacoord/server_test.go @@ -3607,7 +3607,7 @@ func TestGetFlushState(t *testing.T) { assert.NoError(t, err) assert.EqualValues(t, &milvuspb.GetFlushStateResponse{ Status: &commonpb.Status{ErrorCode: commonpb.ErrorCode_Success}, - Flushed: false, + Flushed: true, }, resp) }) } diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go index 570b72ac05..9dfb6a39b4 100644 --- a/internal/datacoord/services.go +++ b/internal/datacoord/services.go @@ -1309,10 +1309,10 @@ func (s *Server) GetFlushState(ctx context.Context, req *datapb.GetFlushStateReq channels = append(channels, channelNames...) } - if len(channels) == 0 { - resp.Flushed = false + if len(channels) == 0 { // For compatibility with old client + resp.Flushed = true resp.Status.ErrorCode = commonpb.ErrorCode_Success - log.Warn("GetFlushState failed, no channels found") + log.Info("GetFlushState all flushed without checking flush ts") return resp, nil } diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index a17d1ffc88..57e687b8b0 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -3617,21 +3617,23 @@ func (node *Proxy) GetFlushState(ctx context.Context, req *milvuspb.GetFlushStat return resp, nil } - if err = validateCollectionName(req.GetCollectionName()); err != nil { - resp.Status = merr.Status(err) - return resp, nil - } - collectionID, err := globalMetaCache.GetCollectionID(ctx, req.GetDbName(), req.GetCollectionName()) - if err != nil { - resp.Status = merr.Status(err) - return resp, nil - } - stateReq := &datapb.GetFlushStateRequest{ SegmentIDs: req.GetSegmentIDs(), FlushTs: req.GetFlushTs(), } - stateReq.CollectionID = collectionID + + if len(req.GetCollectionName()) > 0 { // For compatibility with old client + if err = validateCollectionName(req.GetCollectionName()); err != nil { + resp.Status = merr.Status(err) + return resp, nil + } + collectionID, err := globalMetaCache.GetCollectionID(ctx, req.GetDbName(), req.GetCollectionName()) + if err != nil { + resp.Status = merr.Status(err) + return resp, nil + } + stateReq.CollectionID = collectionID + } resp, err = node.dataCoord.GetFlushState(ctx, stateReq) if err != nil {