[incubator-iotdb] branch master updated: Fix bug IOTDB-159

[leirui]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 867a0ae  Fix bug IOTDB-159
     new 20b42cd  Merge pull request #693 from LeiRui/IOTDB-159
867a0ae is described below

commit 867a0ae7a9893b317136b5de39f6e87ef7474f91
Author: Lei Rui <1010953...@qq.com>
AuthorDate: Mon Dec 30 14:46:03 2019 +0800

    Fix bug IOTDB-159
---
 .../org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java     | 3 +++
 .../org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java   | 3 +++
 2 files changed, 6 insertions(+)

diff --git 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
index 11a7d11..cbfd1fa 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/SeqTsFileRecoverTest.java
@@ -28,6 +28,7 @@ import java.util.List;
 import org.apache.commons.io.FileUtils;
 import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter;
 import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
+import org.apache.iotdb.db.engine.flush.pool.FlushSubTaskPoolManager;
 import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
 import org.apache.iotdb.db.engine.version.VersionController;
 import 
org.apache.iotdb.db.exception.storageGroup.StorageGroupProcessorException;
@@ -78,6 +79,7 @@ public class SeqTsFileRecoverTest {
 
   @Before
   public void setup() throws IOException, WriteProcessException {
+    FlushSubTaskPoolManager.getInstance().start();
     tsF = SystemFileFactory.INSTANCE.getFile(logNodePrefix, "test.ts");
     tsF.getParentFile().mkdirs();
 
@@ -130,6 +132,7 @@ public class SeqTsFileRecoverTest {
     FileUtils.deleteDirectory(tsF.getParentFile());
     resource.close();
     node.delete();
+    FlushSubTaskPoolManager.getInstance().stop();
   }
 
   @Test
diff --git 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
index 8b88e8f..351228c 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/writelog/recover/UnseqTsFileRecoverTest.java
@@ -26,6 +26,7 @@ import java.io.IOException;
 import org.apache.commons.io.FileUtils;
 import org.apache.iotdb.db.conf.adapter.ActiveTimeSeriesCounter;
 import org.apache.iotdb.db.engine.fileSystem.SystemFileFactory;
+import org.apache.iotdb.db.engine.flush.pool.FlushSubTaskPoolManager;
 import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
 import org.apache.iotdb.db.engine.version.VersionController;
 import 
org.apache.iotdb.db.exception.storageGroup.StorageGroupProcessorException;
@@ -80,6 +81,7 @@ public class UnseqTsFileRecoverTest {
 
   @Before
   public void setup() throws IOException, WriteProcessException {
+    FlushSubTaskPoolManager.getInstance().start();
     tsF = SystemFileFactory.INSTANCE.getFile(logNodePrefix, "test.ts");
     tsF.getParentFile().mkdirs();
 
@@ -138,6 +140,7 @@ public class UnseqTsFileRecoverTest {
   public void tearDown() throws IOException {
     FileUtils.deleteDirectory(tsF.getParentFile());
     node.delete();
+    FlushSubTaskPoolManager.getInstance().stop();
   }
 
   @Test