You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2018/05/16 00:57:56 UTC

hbase git commit: HBASE-20585 Need to clear peer map when clearing MasterProcedureScheduler

Repository: hbase
Updated Branches:
  refs/heads/master 26babcf01 -> ab53329cb


HBASE-20585 Need to clear peer map when clearing MasterProcedureScheduler


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ab53329c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ab53329c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ab53329c

Branch: refs/heads/master
Commit: ab53329cb3a56296ad05ee68735eb78896819cd3
Parents: 26babcf
Author: zhangduo <zh...@apache.org>
Authored: Tue May 15 21:24:13 2018 +0800
Committer: zhangduo <zh...@apache.org>
Committed: Wed May 16 08:46:29 2018 +0800

----------------------------------------------------------------------
 .../hadoop/hbase/master/procedure/MasterProcedureScheduler.java  | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/ab53329c/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
index a3bd938..69a6e8f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterProcedureScheduler.java
@@ -247,6 +247,10 @@ public class MasterProcedureScheduler extends AbstractProcedureScheduler {
     clear(tableMap, tableRunQueue, TABLE_QUEUE_KEY_COMPARATOR);
     tableMap = null;
 
+    // Remove Peers
+    clear(peerMap, peerRunQueue, PEER_QUEUE_KEY_COMPARATOR);
+    peerMap = null;
+
     assert size() == 0 : "expected queue size to be 0, got " + size();
   }