From 2213ed7bedf7705bbbdec5c17f88b83f78557ff3 Mon Sep 17 00:00:00 2001 From: Xiaofan <83447078+xiaofan-luan@users.noreply.github.com> Date: Thu, 2 Feb 2023 13:11:51 +0800 Subject: [PATCH] Fix bulkload segment can not be flushed (#21919) Signed-off-by: xiaofan-luan --- internal/datacoord/segment_allocation_policy.go | 3 +-- internal/rootcoord/import_manager.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/datacoord/segment_allocation_policy.go b/internal/datacoord/segment_allocation_policy.go index abcea9a69..9333e44b1 100644 --- a/internal/datacoord/segment_allocation_policy.go +++ b/internal/datacoord/segment_allocation_policy.go @@ -185,7 +185,6 @@ const flushInterval = 2 * time.Second func flushPolicyV1(segment *SegmentInfo, t Timestamp) bool { return segment.GetState() == commonpb.SegmentState_Sealed && - segment.GetLastExpireTime() <= t && time.Since(segment.lastFlushTime) >= flushInterval && - segment.currRows != 0 + (segment.GetLastExpireTime() <= t && segment.currRows != 0 || (segment.IsImporting)) } diff --git a/internal/rootcoord/import_manager.go b/internal/rootcoord/import_manager.go index a88176650..c2b5c3a5a 100644 --- a/internal/rootcoord/import_manager.go +++ b/internal/rootcoord/import_manager.go @@ -731,7 +731,6 @@ func (m *importManager) getTaskState(tID int64) *milvuspb.GetImportStateResponse }, Infos: make([]*commonpb.KeyValuePair, 0), } - log.Debug("getting import task state", zap.Int64("task ID", tID)) // (1) Search in pending tasks list. found := false m.pendingLock.Lock() @@ -771,6 +770,7 @@ func (m *importManager) getTaskState(tID int64) *milvuspb.GetImportStateResponse zap.Error(err)) } if found { + log.Info("getting import task state", zap.Int64("task ID", tID), zap.Any("state", resp.State), zap.Int64s("segment", resp.SegmentIds)) return resp } log.Debug("get import task state failed", zap.Int64("taskID", tID)) -- GitLab