HBASE-10897 On master start, deadlock if refresh UI

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1586705 13f79535-47bb-0310-9956-ffa450edef68

hbase-server/src/main/jamon/org/apache/hadoop/hbase/tmpl/master/MasterStatusTmpl.jamon

@@ -198,7 +198,9 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
                 </div>
             </div>
         </section>
+        <%if master.getAssignmentManager() != null %>
         <& AssignmentManagerStatusTmpl; assignmentManager=master.getAssignmentManager()&>
+        </%if>
 	<%else>
         <section>
             <& BackupMasterStatusTmpl; master = master &>
@@ -266,7 +268,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
 	                </tr>
 	                <tr>
 	                    <td>Load average</td>
-	                    <td><% StringUtils.limitDecimalTo2(master.getServerManager().getAverageLoad()) %></td>
+	                    <td><% master.getServerManager() == null ? "0.00" :
+	                      StringUtils.limitDecimalTo2(master.getServerManager().getAverageLoad()) %></td>
 	                    <td>Average number of regions per regionserver. Naive computation.</td>
 	                </tr>
 	                <%if frags != null %>
@@ -278,7 +281,8 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
 	                </%if>
 	                <tr>
 	                    <td>Coprocessors</td>
-	                    <td><% java.util.Arrays.toString(master.getMasterCoprocessors()) %></td>
+	                    <td><% master.getMasterCoprocessorHost() == null ? "[]" :
+	                      java.util.Arrays.toString(master.getMasterCoprocessors()) %></td>
 	                    <td>Coprocessors currently loaded by the master</td>
 	                </tr>
                 </%if>
@@ -295,10 +299,10 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
 
 <%def catalogTables>
 <%java>
- HTableDescriptor[] sysTables = admin.listTableDescriptorsByNamespace(NamespaceDescriptor
+ HTableDescriptor[] sysTables = master.isInitialized() ? admin.listTableDescriptorsByNamespace(
- .SYSTEM_NAMESPACE_NAME_STR);
+   NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR) : null;
 </%java>
-
+<%if (sysTables != null && sysTables.length > 0)%>
 <table class="table table-striped">
 <tr>
     <th>Table Name</th>
@@ -326,11 +330,12 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
 </tr>
 </%for>
 </table>
+</%if>
 </%def>
 
 <%def userTables>
 <%java>
-   HTableDescriptor[] tables = admin.listTables();
+   HTableDescriptor[] tables = master.isInitialized() ? admin.listTables() : null;
 </%java>
 <%if (tables != null && tables.length > 0)%>
 <table class="table table-striped">
@@ -360,7 +365,7 @@ AssignmentManager assignmentManager = master.getAssignmentManager();
 
 <%def userSnapshots>
 <%java>
-   List<SnapshotDescription> snapshots = admin.listSnapshots();
+   List<SnapshotDescription> snapshots = master.isInitialized() ? admin.listSnapshots() : null;
 </%java>
 <%if (snapshots != null && snapshots.size() > 0)%>
 <table class="table table-striped">

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

@@ -722,6 +722,11 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
     tableNamespaceManager.start();
   }
 
+  boolean isCatalogJanitorEnabled() {
+    return catalogJanitorChore != null ?
+      catalogJanitorChore.getEnabled() : false;
+  }
+
   private void splitMetaLogBeforeAssignment(ServerName currentMetaServer) throws IOException {
     if (this.distributedLogReplay) {
       // In log replay mode, we mark hbase:meta region as recovering in ZK
@@ -1503,14 +1508,22 @@ public class HMaster extends HRegionServer implements MasterServices, Server {
         return s1.getServerName().compareTo(s2.getServerName());
       }});
 
-    return new ClusterStatus(VersionInfo.getVersion(),
+    String clusterId = fileSystemManager != null ?
-      this.fileSystemManager.getClusterId().toString(),
+      fileSystemManager.getClusterId().toString() : null;
-      this.serverManager.getOnlineServers(),
+    Map<String, RegionState> regionsInTransition = assignmentManager != null ?
-      this.serverManager.getDeadServers().copyServerNames(),
+      assignmentManager.getRegionStates().getRegionsInTransition() : null;
-      this.serverName,
+    String[] coprocessors = cpHost != null ? getMasterCoprocessors() : null;
-      backupMasters,
+    boolean balancerOn = loadBalancerTracker != null ?
-      this.assignmentManager.getRegionStates().getRegionsInTransition(),
+      loadBalancerTracker.isBalancerOn() : false;
-      this.getMasterCoprocessors(), this.loadBalancerTracker.isBalancerOn());
+    Map<ServerName, ServerLoad> onlineServers = null;
+    Set<ServerName> deadServers = null;
+    if (serverManager != null) {
+      deadServers = serverManager.getDeadServers().copyServerNames();
+      onlineServers = serverManager.getOnlineServers();
+    }
+    return new ClusterStatus(VersionInfo.getVersion(), clusterId,
+      onlineServers, deadServers, serverName, backupMasters,
+      regionsInTransition, coprocessors, balancerOn);
   }
 
   /**

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

@@ -814,9 +814,8 @@ public class MasterRpcServices extends RSRpcServices
   @Override
   public IsCatalogJanitorEnabledResponse isCatalogJanitorEnabled(RpcController c,
       IsCatalogJanitorEnabledRequest req) throws ServiceException {
-    boolean isEnabled = master.catalogJanitorChore != null ?
+    return IsCatalogJanitorEnabledResponse.newBuilder().setValue(
-      master.catalogJanitorChore.getEnabled() : false;
+      master.isCatalogJanitorEnabled()).build();
-    return IsCatalogJanitorEnabledResponse.newBuilder().setValue(isEnabled).build();
   }
 
   @Override

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

@@ -33,12 +33,9 @@ import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ServerName;
 import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.protobuf.RequestConverter;
 import org.apache.hadoop.hbase.tmpl.master.MasterStatusTmpl;
 import org.apache.hadoop.hbase.util.FSUtils;
 
-import com.google.protobuf.ServiceException;
-
 /**
  * The servlet responsible for rendering the index page of the
  * master.
@@ -57,12 +54,6 @@ public class MasterStatusServlet extends HttpServlet {
 
     response.setContentType("text/html");
 
-    if (!master.isOnline()) {
-      response.getWriter().write("The Master is initializing!");
-      response.getWriter().close();
-      return;
-    }
-
     Configuration conf = master.getConfiguration();
     HBaseAdmin admin = new HBaseAdmin(conf);
 
@@ -72,29 +63,21 @@ public class MasterStatusServlet extends HttpServlet {
     Set<ServerName> deadServers = null;
     
     if(master.isActiveMaster()) {
-      if (!master.isInitialized()) {
-        response.sendError(503, "Master not ready");
-        return;
-      }
       metaLocation = getMetaLocationOrNull(master);
-      //ServerName metaLocation = master.getCatalogTracker().getMetaLocation();
+      ServerManager serverManager = master.getServerManager();
-      servers = master.getServerManager().getOnlineServersList();
+      if (serverManager != null) {
-      deadServers = master.getServerManager().getDeadServers().copyServerNames();
+        deadServers = serverManager.getDeadServers().copyServerNames();
+        servers = serverManager.getOnlineServersList();
+      }
     }
 
-    MasterStatusTmpl tmpl;
+    MasterStatusTmpl tmpl = new MasterStatusTmpl()
-    try {
-       tmpl = new MasterStatusTmpl()
       .setFrags(frags)
       .setMetaLocation(metaLocation)
       .setServers(servers)
       .setDeadServers(deadServers)
-      .setCatalogJanitorEnabled(master.getMasterRpcServices().isCatalogJanitorEnabled(
+      .setCatalogJanitorEnabled(master.isCatalogJanitorEnabled());
-          null, RequestConverter.buildIsCatalogJanitorEnabledRequest()).getValue());
+
-    } catch (ServiceException s) {
-      admin.close();
-      throw new IOException(s);
-    }
     if (request.getParameter("filter") != null)
       tmpl.setFilter(request.getParameter("filter"));
     if (request.getParameter("format") != null)

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

@@ -427,13 +427,12 @@ public class ServerManager {
   public double getAverageLoad() {
     int totalLoad = 0;
     int numServers = 0;
-    double averageLoad;
     for (ServerLoad sl: this.onlineServers.values()) {
         numServers++;
         totalLoad += sl.getNumberOfRegions();
     }
-    averageLoad = (double)totalLoad / (double)numServers;
+    return numServers == 0 ? 0 :
-    return averageLoad;
+      (double)totalLoad / (double)numServers;
   }
 
   /**