svn commit: r1163321 - in /hbase/trunk: CHANGES.txt src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

[to...@apache.org]

Author: todd
Date: Tue Aug 30 18:20:06 2011
New Revision: 1163321

URL: http://svn.apache.org/viewvc?rev=1163321&view=rev
Log:
HBASE-4291  Improve display of regions in transition in UI to be more readable.

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1163321&r1=1163320&r2=1163321&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Tue Aug 30 18:20:06 2011
@@ -419,6 +419,8 @@ Release 0.91.0 - Unreleased
                the Thrift API (Anirudh Todi)
    HBASE-3900  Expose progress of a major compaction in UI and/or in shell
                (Brad Anderson)
+   HBASE-4291  Improve display of regions in transition in UI to be more
+               readable (todd)
 
   TASKS
    HBASE-3559  Move report of split to master OFF the heartbeat channel

Modified: hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon?rev=1163321&r1=1163320&r2=1163321&view=diff
==============================================================================
--- hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon (original)
+++ hbase/trunk/src/main/jamon/org/apache/hbase/tmpl/master/AssignmentManagerStatusTmpl.jamon Tue Aug 30 18:20:06 2011
@@ -36,7 +36,7 @@ No regions in transition.
 	<table>
 		<tr><th>Region</th><th>State</th></tr>
 		<%for Map.Entry<String, RegionState> entry : rit.entrySet() %>
-		<tr><td><% entry.getKey() %></td><td><% entry.getValue() %></td>
+		<tr><td><% entry.getKey() %></td><td><% entry.getValue().toDescriptiveString() %></td>
 		</%for>
 	</table>
 </%if>
\ No newline at end of file

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1163321&r1=1163320&r2=1163321&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Tue Aug 30 18:20:06 2011
@@ -24,6 +24,7 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -2520,6 +2521,19 @@ public class AssignmentManager extends Z
         + ", server=" + serverName;
     }
 
+    /**
+     * A slower (but more easy-to-read) stringification 
+     */
+    public String toDescriptiveString() {
+      long lstamp = stamp.get();
+      long relTime = System.currentTimeMillis() - lstamp;
+      
+      return region.getRegionNameAsString()
+        + " state=" + state
+        + ", ts=" + new Date(lstamp) + " (" + (relTime/1000) + "s ago)"
+        + ", server=" + serverName;
+    }
+
     @Override
     public void readFields(DataInput in) throws IOException {
       region = new HRegionInfo();