You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by nk...@apache.org on 2013/11/06 19:32:20 UTC
svn commit: r1539426 - in /hbase/branches/0.96:
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Author: nkeywal
Date: Wed Nov 6 18:32:20 2013
New Revision: 1539426
URL: http://svn.apache.org/r1539426
Log:
HBASE-9001 Add a toString in HTable, fix a log in AssignmentManager
Modified:
hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
Modified: hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java?rev=1539426&r1=1539425&r2=1539426&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java (original)
+++ hbase/branches/0.96/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java Wed Nov 6 18:32:20 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/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java?rev=1539426&r1=1539425&r2=1539426&view=diff
==============================================================================
--- hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java (original)
+++ hbase/branches/0.96/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java Wed Nov 6 18:32:20 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) {