hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1523098 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java hbase-server/src/main/resources/hbase-webapps/master/table.jsp
Date Fri, 13 Sep 2013 20:52:53 GMT
Author: stack
Date: Fri Sep 13 20:52:53 2013
New Revision: 1523098

URL: http://svn.apache.org/r1523098
Log:
HBASE-9328 Table web UI is corrupted sometime

Modified:
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
    hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1523098&r1=1523097&r2=1523098&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
(original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
Fri Sep 13 20:52:53 2013
@@ -2525,6 +2525,15 @@ public class HBaseAdmin implements Abort
                 pair.getFirst() + ": " +
                 StringUtils.stringifyException(e));
             }
+          } catch (RemoteException e) {
+            if (e.getMessage().indexOf(NotServingRegionException.class.getName()) >= 0)
{
+              if (LOG.isDebugEnabled()) {
+                LOG.debug("Trying to get compaction state of " + pair.getFirst() + ": "
+                    + StringUtils.stringifyException(e));
+              }
+            } else {
+              throw e;
+            }
           }
         }
       }

Modified: hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp?rev=1523098&r1=1523097&r2=1523098&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp (original)
+++ hbase/trunk/hbase-server/src/main/resources/hbase-webapps/master/table.jsp Fri Sep 13
20:52:53 2013
@@ -32,6 +32,8 @@
   import="org.apache.hadoop.hbase.master.HMaster" 
   import="org.apache.hadoop.hbase.util.Bytes"
   import="org.apache.hadoop.hbase.util.FSUtils"
+  import="org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest"
+  import="org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState"
   import="org.apache.hadoop.hbase.TableName"
   import="org.apache.hadoop.hbase.HBaseConfiguration" %>
 <%
@@ -221,7 +223,20 @@
   </tr>
   <tr>
       <td>Compaction</td>
-      <td><%= hbadmin.getCompactionState(table.getTableName()) %></td>
+      <td>
+<%
+  try {
+    CompactionState compactionState = hbadmin.getCompactionState(table.getTableName());
+%>
+<%= compactionState %>
+<%
+  } catch (Exception e) {
+  // Nothing really to do here
+    e.printStackTrace();
+%> Unknown <%
+  }
+%>
+      </td>
       <td>Is the table compacting</td>
   </tr>
 <%  if (showFragmentation) { %>



Mime
View raw message