commit 7deeb9d34706255143af7e9891b24f4b3e1be50f
author ChenKai <514793425@qq.com> Tue May 19 16:42:56 2020 +0800
committer GitHub <noreply@github.com> Tue May 19 09:42:56 2020 +0100
tree 45cbe8df6aa04cddc7b9431bf1d560d1febd437a
parent 5b84d7a9a8e5b006afd1de7b040a9273ee297fa4

HBASE-24398 [hbase-operator-tools] Fix RegionsMerger ConcurrentModificationException #60

Signed-off-by: Wellington Chevreuil <wchevreuil@apache.org>

hbase-tools/src/main/java/org/apache/hbase/RegionsMerger.java

diff --git a/hbase-tools/src/main/java/org/apache/hbase/RegionsMerger.java b/hbase-tools/src/main/java/org/apache/hbase/RegionsMerger.java
index afe3ab4..dd23abb 100644
--- a/hbase-tools/src/main/java/org/apache/hbase/RegionsMerger.java
+++ b/hbase-tools/src/main/java/org/apache/hbase/RegionsMerger.java
@@ -25,10 +25,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Future;
 import java.util.concurrent.atomic.LongAdder;
 
@@ -168,7 +167,7 @@
       LongAdder lastTimeProgessed = new LongAdder();
       //need to get all regions for the table, regardless of region state
       List<RegionInfo> regions = admin.getRegions(table);
-      Map<Future, Pair<RegionInfo, RegionInfo>> regionsMerging = new HashMap<>();
+      Map<Future, Pair<RegionInfo, RegionInfo>> regionsMerging = new ConcurrentHashMap<>();
       long roundsNoProgress = 0;
       while (regions.size() > targetRegions) {
         LOG.info("Iteration: {}", counter);