hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nkey...@apache.org
Subject svn commit: r1539425 - in /hbase/trunk: hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Date Wed, 06 Nov 2013 18:31:54 GMT
Author: nkeywal
Date: Wed Nov  6 18:31:54 2013
New Revision: 1539425

URL: http://svn.apache.org/r1539425
Log:
HBASE-9001 Add a toString in HTable, fix a log in AssignmentManager

Modified:
    hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java

Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1539425&r1=1539424&r2=1539425&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java Wed
Nov  6 18:31:54 2013
@@ -1523,6 +1523,11 @@ public class HTable implements HTableInt
     return operationTimeout;
   }
 
+  @Override
+  public String toString() {
+    return tableName + ", " + connection;
+  }
+
   /**
    * Run basic test.
    * @param args Pass table name and row and will get the content.

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1539425&r1=1539424&r2=1539425&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
(original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Wed Nov  6 18:31:54 2013
@@ -2839,12 +2839,12 @@ public class AssignmentManager extends Z
   public boolean waitOnRegionToClearRegionsInTransition(final HRegionInfo hri, long timeOut)
       throws InterruptedException {
     if (!regionStates.isRegionInTransition(hri)) return true;
-    RegionState rs = null;
     long end = (timeOut <= 0) ? Long.MAX_VALUE : EnvironmentEdgeManager.currentTimeMillis()
         + timeOut;
     // There is already a timeout monitor on regions in transition so I
     // should not have to have one here too?
-    LOG.info("Waiting on " + rs + " to clear regions-in-transition");
+    LOG.info("Waiting for " + hri.getEncodedName() +
+        " to leave regions-in-transition, timeOut=" + timeOut + " ms.");
     while (!this.server.isStopped() && regionStates.isRegionInTransition(hri)) {
       regionStates.waitForUpdate(100);
       if (EnvironmentEdgeManager.currentTimeMillis() > end) {



Mime
View raw message