From 82e3011166758736e9d01f498db2b36e5d087beb Mon Sep 17 00:00:00 2001 From: zhangduo Date: Tue, 15 May 2018 21:24:13 +0800 Subject: [PATCH] HBASE-20585 Need to clear peer map when clearing MasterProcedureScheduler --- .../hbase/master/procedure/MasterProcedureScheduler.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1a393073d52..d78efc6d0b3 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(); }