[incubator-iotdb] branch enhance_merge_management updated: clear task map when stopped

[jiangtian]

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

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


The following commit(s) were added to refs/heads/enhance_merge_management by 
this push:
     new 75c7486  clear task map when stopped
75c7486 is described below

commit 75c7486cf55b51ca7d03ffb04f2f554d6fef8f11
Author: jt2594838 <jt2594...@163.com>
AuthorDate: Tue Jun 9 19:28:04 2020 +0800

    clear task map when stopped
---
 .../java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
 
b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
index 1c87a40..15d3a2f 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/engine/merge/manage/MergeManager.java
@@ -66,7 +66,6 @@ public class MergeManager implements IService, 
MergeManagerMBean {
   private ScheduledExecutorService timedMergeThreadPool;
   private ScheduledExecutorService taskCleanerThreadPool;
 
-  // TODO: add to JMX
   private Map<String, Set<MergeFuture>> storageGroupMainTasks = new 
ConcurrentHashMap<>();
   private Map<String, Set<MergeFuture>> storageGroupSubTasks = new 
ConcurrentHashMap<>();
 
@@ -143,6 +142,8 @@ public class MergeManager implements IService, 
MergeManagerMBean {
         }
       }
       mergeTaskPool = null;
+      storageGroupMainTasks.clear();
+      storageGroupSubTasks.clear();
       logger.info("MergeManager stopped");
     }
     JMXService.deregisterMBean(mbeanName);
@@ -170,6 +171,8 @@ public class MergeManager implements IService, 
MergeManagerMBean {
         }
       }
       mergeTaskPool = null;
+      storageGroupMainTasks.clear();
+      storageGroupSubTasks.clear();
       logger.info("MergeManager stopped");
     }
   }