(iotdb) branch master updated: Fix UT testLargeFileInLowerLevel timeout (#11568)

[haonan]

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 8548f4c3edb Fix UT testLargeFileInLowerLevel timeout (#11568)
8548f4c3edb is described below

commit 8548f4c3edb3d348db7a197a5fed4eade2a23066
Author: Haonan <hhao...@outlook.com>
AuthorDate: Fri Nov 17 18:16:53 2023 +0800

    Fix UT testLargeFileInLowerLevel timeout (#11568)
---
 .../storageengine/dataregion/compaction/CompactionSchedulerTest.java  | 1 +
 .../dataregion/compaction/utils/CompactionConfigRestorer.java         | 4 ++++
 2 files changed, 5 insertions(+)

diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java
index 7f18090f7f7..52b6f091576 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/CompactionSchedulerTest.java
@@ -105,6 +105,7 @@ public class CompactionSchedulerTest {
         .getConfig()
         
.setInnerUnseqCompactionPerformer(InnerUnseqCompactionPerformer.READ_POINT);
     
IoTDBDescriptor.getInstance().getConfig().setMinCrossCompactionUnseqFileLevel(0);
+    
IoTDBDescriptor.getInstance().getConfig().setEnableCompactionMemControl(false);
     CompactionTaskManager.getInstance().start();
     while (CompactionTaskManager.getInstance().getExecutingTaskCount() > 0) {
       try {
diff --git 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java
 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java
index a7858b9dc6a..a280ae220f8 100644
--- 
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java
+++ 
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/compaction/utils/CompactionConfigRestorer.java
@@ -58,6 +58,9 @@ public class CompactionConfigRestorer {
   private int oldMinCrossCompactionUnseqLevel =
       
IoTDBDescriptor.getInstance().getConfig().getMinCrossCompactionUnseqFileLevel();
 
+  private boolean oldEnableCompactionMemControl =
+      IoTDBDescriptor.getInstance().getConfig().isEnableCompactionMemControl();
+
   public CompactionConfigRestorer() {}
 
   public void restoreCompactionConfig() {
@@ -83,5 +86,6 @@ public class CompactionConfigRestorer {
     config.setInnerSeqCompactionPerformer(oldInnerSeqPerformer);
     config.setInnerUnseqCompactionPerformer(oldInnerUnseqPerformer);
     
config.setMinCrossCompactionUnseqFileLevel(oldMinCrossCompactionUnseqLevel);
+    config.setEnableCompactionMemControl(oldEnableCompactionMemControl);
   }
 }