[iotdb] branch cluster- updated: fix error if pool is null in FlushManager

[hx...@apache.org]

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

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


The following commit(s) were added to refs/heads/cluster- by this push:
     new 4c08775  fix error if pool is null in FlushManager
4c08775 is described below

commit 4c087750ddc401e039472f782b2e965507d0191d
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Sun Sep 26 20:43:04 2021 +0800

    fix error if pool is null in FlushManager
---
 .../apache/iotdb/cluster/server/member/MetaGroupMember.java   | 10 ----------
 .../java/org/apache/iotdb/db/engine/flush/FlushManager.java   |  2 +-
 .../iotdb/db/engine/flush/pool/AbstractPoolManager.java       | 11 +++++++++++
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
index 5d71544..d3d44e1 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
@@ -312,16 +312,6 @@ public class MetaGroupMember extends RaftMember implements IService, MetaGroupMe
   }
 
   @Override
-  public void waitAndStop(long milliseconds) {
-    IService.super.waitAndStop(milliseconds);
-  }
-
-  @Override
-  public void shutdown(long milliseconds) throws ShutdownException {
-    IService.super.shutdown(milliseconds);
-  }
-
-  @Override
   public ServiceType getID() {
     return ServiceType.CLUSTER_META_ENGINE;
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
index 32741bb..1901fd1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
@@ -52,7 +52,7 @@ public class FlushManager implements FlushManagerMBean, IService {
   @Override
   public void start() throws StartupException {
     FlushSubTaskPoolManager.getInstance().start();
-    FlushTaskPoolManager.getInstance().start();
+    flushPool.start();
     try {
       JMXService.registerMBean(this, ServiceType.FLUSH_SERVICE.getJmxName());
     } catch (Exception e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/AbstractPoolManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/AbstractPoolManager.java
index c2f9003..c3bda04 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/AbstractPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/AbstractPoolManager.java
@@ -61,10 +61,18 @@ public abstract class AbstractPoolManager {
   }
 
   public int getWorkingTasksNumber() {
+    // in ITs, pool may be closed and therefore pool will be null
+    if (pool == null) {
+      return 0;
+    }
     return ((ThreadPoolExecutor) pool).getActiveCount();
   }
 
   public int getWaitingTasksNumber() {
+    // in ITs, pool may be closed and therefore pool will be null
+    if (pool == null) {
+      return 0;
+    }
     return ((ThreadPoolExecutor) pool).getQueue().size();
   }
 
@@ -73,6 +81,9 @@ public abstract class AbstractPoolManager {
   }
 
   public int getCorePoolSize() {
+    if (pool == null) {
+      return 0;
+    }
     return ((ThreadPoolExecutor) pool).getCorePoolSize();
   }