HBASE-20214 Review of RegionLocationFinder Class - revert due to the pending removal of commons-collections4 dependency

hbase-server/src/main/java/org/apache/hadoop/hbase/master/balancer/RegionLocationFinder.java

@@ -21,18 +21,12 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.MultiValuedMap;
-import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ClusterMetrics;
 import org.apache.hadoop.hbase.HDFSBlocksDistribution;
@@ -47,10 +41,10 @@ import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.yetus.audience.InterfaceAudience;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
 import org.apache.hbase.thirdparty.com.google.common.cache.CacheBuilder;
 import org.apache.hbase.thirdparty.com.google.common.cache.CacheLoader;
 import org.apache.hbase.thirdparty.com.google.common.cache.LoadingCache;
+import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
 import org.apache.hbase.thirdparty.com.google.common.util.concurrent.Futures;
 import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ListenableFuture;
 import org.apache.hbase.thirdparty.com.google.common.util.concurrent.ListeningExecutorService;
@@ -138,6 +132,7 @@ class RegionLocationFinder {
       // Only count the refresh if it includes user tables ( eg more than meta and namespace ).
       lastFullRefresh = scheduleFullRefresh()?currentTime:lastFullRefresh;
     }
+
   }
 
   /**
@@ -176,10 +171,14 @@ class RegionLocationFinder {
    */
   protected List<ServerName> getTopBlockLocations(RegionInfo region, String currentHost) {
     HDFSBlocksDistribution blocksDistribution = getBlockDistribution(region);
-    List<String> topHosts = blocksDistribution.getTopHosts();
+    List<String> topHosts = new ArrayList<>();
-    int toIndex = topHosts.indexOf(currentHost);
+    for (String host : blocksDistribution.getTopHosts()) {
-    List<String> subTopHosts = (toIndex < 0) ? topHosts : topHosts.subList(0, toIndex);
+      if (host.equals(currentHost)) {
-    return mapHostNameToServerName(subTopHosts);
+        break;
+      }
+      topHosts.add(host);
+    }
+    return mapHostNameToServerName(topHosts);
   }
 
   /**
@@ -212,7 +211,7 @@ class RegionLocationFinder {
    *
    * @param tableName the table name
    * @return TableDescriptor
-   * @throws IOException if table descriptor cannot be loaded
+   * @throws IOException
    */
   protected TableDescriptor getTableDescriptor(TableName tableName) throws IOException {
     TableDescriptor tableDescriptor = null;
@@ -221,8 +220,8 @@ class RegionLocationFinder {
         tableDescriptor = this.services.getTableDescriptors().get(tableName);
       }
     } catch (FileNotFoundException fnfe) {
-      LOG.debug("FileNotFoundException during getTableDescriptors. Current table name =  {}",
+      LOG.debug("FileNotFoundException during getTableDescriptors." + " Current table name = "
-          tableName, fnfe);
+          + tableName, fnfe);
     }
 
     return tableDescriptor;
@@ -236,36 +235,60 @@ class RegionLocationFinder {
    * @return ServerName list
    */
   protected List<ServerName> mapHostNameToServerName(List<String> hosts) {
-    if (hosts == null) {
+    if (hosts == null || status == null) {
-      LOG.warn("RegionLocationFinder top hosts is null");
+      if (hosts == null) {
-      return Collections.emptyList();
+        LOG.warn("RegionLocationFinder top hosts is null");
-    }
+      }
-    if (status == null) {
+      return Lists.newArrayList();
-      return Collections.emptyList();
     }
 
     List<ServerName> topServerNames = new ArrayList<>();
     Collection<ServerName> regionServers = status.getLiveServerMetrics().keySet();
 
     // create a mapping from hostname to ServerName for fast lookup
-    MultiValuedMap<String, ServerName> hostToServerName = new ArrayListValuedHashMap<>();
+    HashMap<String, List<ServerName>> hostToServerName = new HashMap<>();
     for (ServerName sn : regionServers) {
-      String hostName = sn.getHostname();
+      String host = sn.getHostname();
-      hostToServerName.put(hostName, sn);
+      if (!hostToServerName.containsKey(host)) {
+        hostToServerName.put(host, new ArrayList<>());
+      }
+      hostToServerName.get(host).add(sn);
     }
 
     for (String host : hosts) {
+      if (!hostToServerName.containsKey(host)) {
+        continue;
+      }
       for (ServerName sn : hostToServerName.get(host)) {
         // it is possible that HDFS is up ( thus host is valid ),
         // but RS is down ( thus sn is null )
-        CollectionUtils.addIgnoreNull(topServerNames, sn);
+        if (sn != null) {
+          topServerNames.add(sn);
+        }
       }
     }
     return topServerNames;
   }
 
   public HDFSBlocksDistribution getBlockDistribution(RegionInfo hri) {
-    return cache.getUnchecked(hri);
+    HDFSBlocksDistribution blockDistbn = null;
+    try {
+      if (cache.asMap().containsKey(hri)) {
+        blockDistbn = cache.get(hri);
+        return blockDistbn;
+      } else {
+        LOG.debug("HDFSBlocksDistribution not found in cache for region "
+            + hri.getRegionNameAsString());
+        blockDistbn = internalGetTopBlockLocation(hri);
+        cache.put(hri, blockDistbn);
+        return blockDistbn;
+      }
+    } catch (ExecutionException e) {
+      LOG.warn("Error while fetching cache entry ", e);
+      blockDistbn = internalGetTopBlockLocation(hri);
+      cache.put(hri, blockDistbn);
+      return blockDistbn;
+    }
   }
 
   private ListenableFuture<HDFSBlocksDistribution> asyncGetBlockDistribution(
@@ -278,24 +301,24 @@ class RegionLocationFinder {
   }
 
   public void refreshAndWait(Collection<RegionInfo> hris) {
-    Map<RegionInfo, ListenableFuture<HDFSBlocksDistribution>> regionLocationFutures =
+    ArrayList<ListenableFuture<HDFSBlocksDistribution>> regionLocationFutures = new ArrayList<>(hris.size());
-        new HashMap<>(hris.size() * 2);
-
     for (RegionInfo hregionInfo : hris) {
-      regionLocationFutures.put(hregionInfo, asyncGetBlockDistribution(hregionInfo));
+      regionLocationFutures.add(asyncGetBlockDistribution(hregionInfo));
     }
+    int index = 0;
     for (RegionInfo hregionInfo : hris) {
       ListenableFuture<HDFSBlocksDistribution> future = regionLocationFutures
-          .get(hregionInfo);
+          .get(index);
       try {
         cache.put(hregionInfo, future.get());
       } catch (InterruptedException ite) {
         Thread.currentThread().interrupt();
       } catch (ExecutionException ee) {
         LOG.debug(
-            "ExecutionException during HDFSBlocksDistribution computation. for region = {}",
+            "ExecutionException during HDFSBlocksDistribution computation. for region = "
-                hregionInfo.getEncodedName(), ee);
+                + hregionInfo.getEncodedName(), ee);
       }
+      index++;
     }
   }