[incubator-iotdb] branch master updated: [IOTDB-729] shutdown uncessary threadpool (#1295)

[qiaojialin]

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

qiaojialin 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 b2652d9  [IOTDB-729] shutdown uncessary threadpool (#1295)
b2652d9 is described below

commit b2652d9765cc345f0ce05d7964909207112678bd
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Mon Jun 1 22:00:03 2020 +0800

    [IOTDB-729] shutdown uncessary threadpool (#1295)
    
    * shutdown uncessary threadpool
---
 server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java    | 1 +
 .../apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java    | 2 ++
 server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java   | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java 
b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index ca6fc86..65f99d4 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -181,6 +181,7 @@ public class StorageEngine implements IService {
         throw new StorageEngineFailureException("StorageEngine failed to 
recover.", e);
       }
     }
+    recoveryThreadPool.shutdown();
   }
 
   @Override
diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
index 80a915a..6f85824 100755
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java
@@ -80,6 +80,7 @@ import org.apache.iotdb.db.qp.physical.crud.InsertPlan;
 import org.apache.iotdb.db.qp.physical.crud.InsertTabletPlan;
 import org.apache.iotdb.db.query.context.QueryContext;
 import org.apache.iotdb.db.query.control.QueryFileManager;
+import org.apache.iotdb.db.service.UpgradeSevice;
 import org.apache.iotdb.db.utils.CopyOnReadLinkedList;
 import org.apache.iotdb.db.writelog.recover.TsFileRecoverPerformer;
 import org.apache.iotdb.rpc.RpcUtils;
@@ -1537,6 +1538,7 @@ public class StorageGroupProcessor {
           }
         }
       }
+      UpgradeSevice.getINSTANCE().stop();
     }
   }
 
diff --git 
a/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java 
b/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java
index 33baee6..b7d1b89 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java
@@ -58,6 +58,10 @@ public class UpgradeSevice implements IService {
         r -> new Thread(r, "UpgradeThread-" + threadCnt.getAndIncrement()));
     UpgradeLog.createUpgradeLog();
     countUpgradeFiles();
+    if (cntUpgradeFileNum == 0) {
+      stop();
+      return;
+    }
     upgradeAll();
   }