You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2012/05/08 22:09:16 UTC
svn commit: r1335734 - in /hbase/branches/0.92: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Author: stack
Date: Tue May 8 20:09:16 2012
New Revision: 1335734
URL: http://svn.apache.org/viewvc?rev=1335734&view=rev
Log:
HBASE-5942 HConnnectionManager.getRegionServerWithRetries doesn't call afterCall properly
Modified:
hbase/branches/0.92/CHANGES.txt
hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1335734&r1=1335733&r2=1335734&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Tue May 8 20:09:16 2012
@@ -60,6 +60,7 @@ Release 0.92.2 - Unreleased
HBASE-5883 Backup master is going down due to connection refused exception (Jieshan)
HBASE-5928 Hbck shouldn't npe when there are no tables (Elliott Clark)
HBASE-5894 Table deletion failed but HBaseAdmin#deletetable reports it as success (Xufeng)
+ HBASE-5942 HConnnectionManager.getRegionServerWithRetries doesn't call afterCall properly
IMPROVEMENTS
HBASE-5592 Make it easier to get a table from shell (Ben West)
Modified: hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1335734&r1=1335733&r2=1335734&view=diff
==============================================================================
--- hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/branches/0.92/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Tue May 8 20:09:16 2012
@@ -1322,8 +1322,11 @@ public class HConnectionManager {
try {
callable.beforeCall();
callable.connect(tries != 0);
- return callable.call();
+ T result = callable.call();
+ callable.afterCall();
+ return result;
} catch (Throwable t) {
+ callable.afterCall();
callable.shouldRetry(t);
t = translateException(t);
if (t instanceof SocketTimeoutException ||
@@ -1344,8 +1347,6 @@ public class HConnectionManager {
if (tries == numRetries - 1) {
throw new RetriesExhaustedException(tries, exceptions);
}
- } finally {
- callable.afterCall();
}
try {
Thread.sleep(getPauseTime(tries));