[iotdb] branch test_travis updated: fix bug that sync thread is not closed in UTs

[hxd]

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

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


The following commit(s) were added to refs/heads/test_travis by this push:
     new fd8d1a5  fix bug that sync thread is not closed in UTs
fd8d1a5 is described below

commit fd8d1a515a664b62519ebcc852ceef65544d6182
Author: xiangdong huang <saint...@gmail.com>
AuthorDate: Fri Nov 6 13:43:07 2020 +0800

    fix bug that sync thread is not closed in UTs
---
 server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java   | 1 +
 .../java/org/apache/iotdb/db/sync/receiver/load/FileLoaderTest.java     | 2 +-
 .../iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java 
b/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
index 1a22421..3f9018a 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RegisterManager.java
@@ -58,6 +58,7 @@ public class RegisterManager {
     for (IService service : iServices) {
       try {
         service.waitAndStop(10000);
+        logger.info(service.getID() + "deregistered");
       } catch (Exception e) {
         logger.error("Failed to stop {} because:", service.getID().getName(), 
e);
       }
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 0a9a9a4..f62c7a3 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
@@ -83,8 +83,8 @@ public class FileLoaderTest {
 
   @After
   public void tearDown() throws InterruptedException, IOException, 
StorageEngineException {
-    IoTDBDescriptor.getInstance().getConfig().setSyncEnable(false);
     EnvironmentUtils.cleanEnv();
+    IoTDBDescriptor.getInstance().getConfig().setSyncEnable(false);
   }
 
   @Test
diff --git 
a/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
 
b/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
index 5d9a9dc..b81f051 100644
--- 
a/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
+++ 
b/server/src/test/java/org/apache/iotdb/db/sync/receiver/recover/SyncReceiverLogAnalyzerTest.java
@@ -88,8 +88,8 @@ public class SyncReceiverLogAnalyzerTest {
 
   @After
   public void tearDown() throws InterruptedException, IOException, 
StorageEngineException {
-    IoTDBDescriptor.getInstance().getConfig().setSyncEnable(false);
     EnvironmentUtils.cleanEnv();
+    IoTDBDescriptor.getInstance().getConfig().setSyncEnable(false);
   }
 
   @Test