Address review feedback

Author: apurtell

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

@@ -1008,7 +1008,7 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
     // initialize load balancer
     this.balancer.setMasterServices(this);
     this.balancer.initialize();
-    this.balancer.updateClusterMetrics(getClusterMetricsInternal());
+    this.balancer.updateClusterMetrics(getClusterMetricsWithoutCoprocessor());
 
     // start up all service threads.
     status.setStatus("Initializing master service threads");
@@ -1096,7 +1096,7 @@ private void finishActiveMasterInitialization(MonitoredTask status) throws IOExc
     }
 
     // set cluster status again after user regions are assigned
-    this.balancer.updateClusterMetrics(getClusterMetricsInternal());
+    this.balancer.updateClusterMetrics(getClusterMetricsWithoutCoprocessor());
 
     // Start balancer and meta catalog janitor after meta and regions have been assigned.
     status.setStatus("Starting balancer and catalog janitor");
@@ -1918,7 +1918,7 @@ public BalanceResponse balance(BalanceRequest request) throws IOException {
       }
 
       //Give the balancer the current cluster state.
-      this.balancer.updateClusterMetrics(getClusterMetricsInternal());
+      this.balancer.updateClusterMetrics(getClusterMetricsWithoutCoprocessor());
 
       List<RegionPlan> plans = this.balancer.balanceCluster(assignments);
 
@@ -2726,11 +2726,11 @@ public void checkTableModifiable(final TableName tableName)
     }
   }
 
-  public ClusterMetrics getClusterMetricsInternal() throws InterruptedIOException {
-    return getClusterMetricsInternal(EnumSet.allOf(Option.class));
+  public ClusterMetrics getClusterMetricsWithoutCoprocessor() throws InterruptedIOException {
+    return getClusterMetricsWithoutCoprocessor(EnumSet.allOf(Option.class));
   }
 
-  public ClusterMetrics getClusterMetricsInternal(EnumSet<Option> options)
+  public ClusterMetrics getClusterMetricsWithoutCoprocessor(EnumSet<Option> options)
       throws InterruptedIOException {
     ClusterMetricsBuilder builder = ClusterMetricsBuilder.newBuilder();
     // given that hbase1 can't submit the request with Option,
@@ -2742,7 +2742,6 @@ public ClusterMetrics getClusterMetricsInternal(EnumSet<Option> options)
     // TASKS and/or LIVE_SERVERS will populate this map, which will be given to the builder if
     // not null after option processing completes.
     Map<ServerName, ServerMetrics> serverMetricsMap = null;
-    boolean processedLiveServers = false;
 
     for (Option opt : options) {
       switch (opt) {
@@ -2763,28 +2762,16 @@ public ClusterMetrics getClusterMetricsInternal(EnumSet<Option> options)
             .collect(Collectors.toList()));
           // TASKS is also synonymous with LIVE_SERVERS for now because task information for
           // regionservers is carried in ServerLoad.
-          // Add entries to serverMetricsMap for all live servers
-          if (serverManager != null && !processedLiveServers) {
-            if (serverMetricsMap == null) {
-              serverMetricsMap = new HashMap<>();
-            }
-            final Map<ServerName, ServerMetrics> map = serverMetricsMap;
-            serverManager.getOnlineServers().entrySet()
-              .forEach(e -> map.put(e.getKey(), e.getValue()));
-            processedLiveServers = true;
+          // Add entries to serverMetricsMap for all live servers, if we haven't already done so
+          if (serverMetricsMap == null) {
+            serverMetricsMap = getOnlineServers();
           }
           break;
         }
         case LIVE_SERVERS: {
-          // Add entries to serverMetricsMap for all live servers
-          if (serverManager != null && !processedLiveServers) {
-            if (serverMetricsMap == null) {
-              serverMetricsMap = new HashMap<>();
-            }
-            final Map<ServerName, ServerMetrics> map = serverMetricsMap;
-            serverManager.getOnlineServers().entrySet()
-              .forEach(e -> map.put(e.getKey(), e.getValue()));
-            processedLiveServers = true;
+          // Add entries to serverMetricsMap for all live servers, if we haven't already done so
+          if (serverMetricsMap == null) {
+            serverMetricsMap = getOnlineServers();
           }
           break;
         }
@@ -2854,6 +2841,16 @@ public ClusterMetrics getClusterMetricsInternal(EnumSet<Option> options)
     return builder.build();
   }
 
+  private Map<ServerName, ServerMetrics> getOnlineServers() {
+    if (serverManager != null) {
+      final Map<ServerName, ServerMetrics> map = new HashMap<>();
+      serverManager.getOnlineServers().entrySet()
+        .forEach(e -> map.put(e.getKey(), e.getValue()));
+      return map;
+    }
+    return null;
+  }
+
   /**
    * @return cluster status
    */
@@ -2865,7 +2862,7 @@ public ClusterMetrics getClusterMetrics(EnumSet<Option> options) throws IOExcept
     if (cpHost != null) {
       cpHost.preGetClusterMetrics();
     }
-    ClusterMetrics status = getClusterMetricsInternal(options);
+    ClusterMetrics status = getClusterMetricsWithoutCoprocessor(options);
     if (cpHost != null) {
       cpHost.postGetClusterMetrics(status);
     }

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

@@ -46,7 +46,7 @@ public ClusterStatusChore(HMaster master, LoadBalancer balancer) {
   @Override
   protected void chore() {
     try {
-      balancer.updateClusterMetrics(master.getClusterMetricsInternal());
+      balancer.updateClusterMetrics(master.getClusterMetricsWithoutCoprocessor());
     } catch (InterruptedIOException e) {
       LOG.warn("Ignoring interruption", e);
     }