svn commit: r1586907 - in /hbase/branches/0.94/src/main: java/org/apache/hadoop/hbase/catalog/CatalogTracker.java resources/hbase-webapps/master/table.jsp

[larsh]

Author: larsh
Date: Sat Apr 12 23:18:32 2014
New Revision: 1586907

URL: http://svn.apache.org/r1586907
Log:
HBASE-10807 -ROOT- still stale in table.jsp if it moved. (Esteban Gutierrez)

Modified:
    
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
    hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp

Modified: 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java?rev=1586907&r1=1586906&r2=1586907&view=diff
==============================================================================
--- 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
 (original)
+++ 
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/catalog/CatalogTracker.java
 Sat Apr 12 23:18:32 2014
@@ -303,7 +303,7 @@ public class CatalogTracker {
    * @throws NotAllMetaRegionsOnlineException if root not available before
    * timeout
    */
-  ServerName waitForRoot(final long timeout)
+  public ServerName waitForRoot(final long timeout)
   throws InterruptedException, NotAllMetaRegionsOnlineException {
     ServerName sn = rootRegionTracker.waitRootRegionLocation(timeout);
     if (sn == null) {

Modified: hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp
URL: 
http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp?rev=1586907&r1=1586906&r2=1586907&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp 
(original)
+++ hbase/branches/0.94/src/main/resources/hbase-webapps/master/table.jsp Sat 
Apr 12 23:18:32 2014
@@ -43,7 +43,7 @@
   String tableName = request.getParameter("name");
   HTable table = new HTable(conf, tableName);
   String tableHeader = "<h2>Table 
Regions</h2><table><tr><th>Name</th><th>Region Server</th><th>Start 
Key</th><th>End Key</th><th>Requests</th></tr>";
-  ServerName rl = master.getCatalogTracker().getRootLocation();
+  ServerName rl = master.getCatalogTracker().waitForRoot(1);
   boolean showFragmentation = 
conf.getBoolean("hbase.master.ui.fragmentation.enabled", false);
   boolean readOnly = conf.getBoolean("hbase.master.ui.readonly", false);
   Map<String, Integer> frags = null;