You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ch...@apache.org on 2021/06/16 03:34:43 UTC

[iotdb] 01/01: fix ci bug

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

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

commit 6c47feba496b3395b56c0569a8a5469e15788bc7
Author: chaow <94...@qq.com>
AuthorDate: Wed Jun 16 11:33:43 2021 +0800

    fix ci bug
---
 .../java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java  | 5 +++++
 server/src/test/resources/logback.xml                                | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
index fe5aeb2..b358f55 100644
--- a/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java
@@ -22,6 +22,7 @@ import org.apache.iotdb.db.conf.IoTDBConstant;
 import org.apache.iotdb.db.conf.IoTDBDescriptor;
 import org.apache.iotdb.db.conf.directories.DirectoryManager;
 import org.apache.iotdb.db.engine.StorageEngine;
+import org.apache.iotdb.db.engine.compaction.CompactionStrategy;
 import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor;
 import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
 import org.apache.iotdb.db.engine.storagegroup.virtualSg.HashVirtualPartitioner;
@@ -61,10 +62,13 @@ public class FileLoaderTest {
   private static final String SG_NAME = "root.sg";
   private String dataDir;
   private IFileLoader fileLoader;
+  private CompactionStrategy compactionStrategy;
 
   @Before
   public void setUp() throws Exception {
     IoTDBDescriptor.getInstance().getConfig().setSyncEnable(true);
+    compactionStrategy = IoTDBDescriptor.getInstance().getConfig().getCompactionStrategy();
+    IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(CompactionStrategy.NO_COMPACTION);
     HashVirtualPartitioner.getInstance().setStorageGroupNum(1);
     EnvironmentUtils.closeStatMonitor();
     EnvironmentUtils.envSetUp();
@@ -87,6 +91,7 @@ public class FileLoaderTest {
   public void tearDown() throws IOException, StorageEngineException {
     EnvironmentUtils.cleanEnv();
     IoTDBDescriptor.getInstance().getConfig().setSyncEnable(false);
+    IoTDBDescriptor.getInstance().getConfig().setCompactionStrategy(compactionStrategy);
     HashVirtualPartitioner.getInstance()
         .setStorageGroupNum(IoTDBDescriptor.getInstance().getConfig().getVirtualStorageGroupNum());
   }
diff --git a/server/src/test/resources/logback.xml b/server/src/test/resources/logback.xml
index c962823..18ed054 100644
--- a/server/src/test/resources/logback.xml
+++ b/server/src/test/resources/logback.xml
@@ -52,7 +52,7 @@
     <logger name="org.apache.iotdb.db.service.MQTTService" level="INFO"/>
     <logger name="org.apache.iotdb.db.sync.receiver.SyncServerManager" level="INFO"/>
     <logger name="DETAILED_FAILURE_QUERY_TRACE" level="ERROR"/>
-    <root level="WARN">
+    <root level="info">
         <appender-ref ref="stdout"/>
     </root>
 </configuration>