fix

Signed-off-by: yangxuan <[email protected]>
milvus-io · Jun 27, 2024 · 609f0ae · 609f0ae
1 parent 26e3823
commit 609f0ae
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/internal/datacoord/compaction_policy_l0_test.go b/internal/datacoord/compaction_policy_l0_test.go
@@ -103,9 +103,9 @@ func (s *CompactionViewManagerSuite) SetupTest() {
 }
 
 func (s *CompactionViewManagerSuite) TestCheckLoop() {
-	s.Run("Test start and close", func() {
+	s.Run("Test start and stop", func() {
 		s.m.Start()
-		s.m.Close()
+		s.m.Stop()
 	})
 
 	s.Run("Test not enable auto compaction", func() {

diff --git a/internal/datacoord/compaction_trigger.go b/internal/datacoord/compaction_trigger.go
@@ -241,7 +241,7 @@ func (t *compactionTrigger) triggerCompaction() error {
 // triggerSingleCompaction trigger a compaction bundled with collection-partition-channel-segment
 func (t *compactionTrigger) triggerSingleCompaction(collectionID, partitionID, segmentID int64, channel string, blockToSendSignal bool) error {
 	// If AutoCompaction disabled, flush request will not trigger compaction
-	if !Params.DataCoordCfg.EnableAutoCompaction.GetAsBool() {
+	if !Params.DataCoordCfg.EnableAutoCompaction.GetAsBool() && !paramtable.Get().DataCoordCfg.EnableCompaction.GetAsBool() {
 		return nil
 	}
 

diff --git a/internal/datacoord/compaction_trigger_v2.go b/internal/datacoord/compaction_trigger_v2.go
@@ -45,6 +45,8 @@ type TriggerManager interface {
 	ManualTrigger(ctx context.Context, collectionID int64, clusteringCompaction bool) (UniqueID, error)
 }
 
+var _ TriggerManager = (*CompactionTriggerManager)(nil)
+
 // CompactionTriggerManager registers Triggers to TriggerType
 // so that when the certain TriggerType happens, the corresponding triggers can
 // trigger the correct compaction plans.
@@ -93,7 +95,7 @@ func (m *CompactionTriggerManager) Start() {
 	go m.startLoop()
 }
 
-func (m *CompactionTriggerManager) Close() {
+func (m *CompactionTriggerManager) Stop() {
 	close(m.closeSig)
 	m.closeWg.Wait()
 }

diff --git a/internal/datacoord/server.go b/internal/datacoord/server.go
@@ -126,7 +126,7 @@ type Server struct {
 
 	compactionTrigger        trigger
 	compactionHandler        compactionPlanContext
-	compactionTriggerManager *CompactionTriggerManager
+	compactionTriggerManager TriggerManager
 
 	syncSegmentsScheduler *SyncSegmentsScheduler
 	metricsCacheManager   *metricsinfo.MetricsCacheManager
@@ -690,7 +690,7 @@ func (s *Server) stopCompaction() {
 		s.compactionTrigger.stop()
 	}
 	if s.compactionTriggerManager != nil {
-		s.compactionTriggerManager.Close()
+		s.compactionTriggerManager.Stop()
 	}
 
 	if s.compactionHandler != nil {

diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go
@@ -548,12 +548,10 @@ func (s *Server) SaveBinlogPaths(ctx context.Context, req *datapb.SaveBinlogPath
 		s.flushCh <- req.SegmentID
 
 		// notify compaction
-		if paramtable.Get().DataCoordCfg.EnableCompaction.GetAsBool() {
-			err := s.compactionTrigger.triggerSingleCompaction(req.GetCollectionID(), req.GetPartitionID(),
-				req.GetSegmentID(), req.GetChannel(), false)
-			if err != nil {
-				log.Warn("failed to trigger single compaction")
-			}
+		err := s.compactionTrigger.triggerSingleCompaction(req.GetCollectionID(), req.GetPartitionID(),
+			req.GetSegmentID(), req.GetChannel(), false)
+		if err != nil {
+			log.Warn("failed to trigger single compaction")
 		}
 	}