You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2012/06/28 14:51:48 UTC
svn commit: r1354990 - in /hbase/branches/0.89-fb/src:
main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Author: mbautin
Date: Thu Jun 28 12:51:47 2012
New Revision: 1354990
URL: http://svn.apache.org/viewvc?rev=1354990&view=rev
Log:
[master] fix testAdmin
Author: pkhemani
Summary:
this test is failing after the recent getRegionServerWithRetries() fix. (Sorry, about the failure.)
The fix is straight-forward. We no longer retry meta lookup failures.
Test Plan: ran test again. checked logs.
Reviewers: mbautin
Reviewed By: mbautin
CC: hbase-eng@
Differential Revision: https://phabricator.fb.com/D506359
Modified:
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1354990&r1=1354989&r2=1354990&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Thu Jun 28 12:51:47 2012
@@ -1328,6 +1328,8 @@ public class HConnectionManager {
callable.getRegionName(), callable.getRow(), tries,
exceptions);
}
+ LOG.debug("getRegionServerWithRetries failed, sleeping for " +
+ pauseTime +"ms. tries = " + tries, t);
try {
Thread.sleep(pauseTime);
} catch (InterruptedException e) {
@@ -1338,6 +1340,9 @@ public class HConnectionManager {
// has been re-populated. We had anyway invalidated it earlier
// before going to sleep.
callable.instantiateRegionLocation(false);
+ } else {
+ LOG.debug("getRegionServerWithRetries failed, " +
+ "retrying immediately tries=" + tries, t);
}
}
}
Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java?rev=1354990&r1=1354989&r2=1354990&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java Thu Jun 28 12:51:47 2012
@@ -281,7 +281,7 @@ public class TestAdmin {
boolean ok = false;
try {
ht.get(get);
- } catch (RetriesExhaustedException e) {
+ } catch (RegionOfflineException e) {
ok = true;
}
// with online schema change it is possible to add column