You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by an...@apache.org on 2016/11/07 05:29:17 UTC
hbase git commit: HBASE-17032 CallQueueTooBigException and
CallDroppedException should not be triggering PFFE
Repository: hbase
Updated Branches:
refs/heads/branch-1.3 b1c17f0ef -> 967076646
HBASE-17032 CallQueueTooBigException and CallDroppedException should not be triggering PFFE
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/96707664
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/96707664
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/96707664
Branch: refs/heads/branch-1.3
Commit: 967076646d7e061b69b822aa25892389e1e803f8
Parents: b1c17f0
Author: Mikhail Antonov <an...@apache.org>
Authored: Fri Nov 4 17:30:17 2016 -0700
Committer: Mikhail Antonov <an...@apache.org>
Committed: Fri Nov 4 17:55:29 2016 -0700
----------------------------------------------------------------------
.../hadoop/hbase/client/PreemptiveFastFailInterceptor.java | 4 +---
.../test/java/org/apache/hadoop/hbase/client/TestFastFail.java | 5 +++--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/96707664/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
index fed87c1..7ac5c45 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java
@@ -174,9 +174,7 @@ class PreemptiveFastFailInterceptor extends RetryingCallerInterceptor {
Throwable t2 = ClientExceptionsUtil.translatePFFE(t1);
boolean isLocalException = !(t2 instanceof RemoteException);
- if ((isLocalException && ClientExceptionsUtil.isConnectionException(t2)) ||
- ClientExceptionsUtil.isCallQueueTooBigException(t2) ||
- ClientExceptionsUtil.isCallDroppedException(t2)) {
+ if ((isLocalException && ClientExceptionsUtil.isConnectionException(t2))) {
couldNotCommunicateWithServer.setValue(true);
guaranteedClientSideOnly.setValue(!(t2 instanceof CallTimeoutException));
handleFailureToServer(serverName, t2);
http://git-wip-us.apache.org/repos/asf/hbase/blob/96707664/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
index bd3fab1..2aeed1e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFastFail.java
@@ -306,7 +306,7 @@ public class TestFastFail {
}
@Test
- public void testCallQueueTooBigException() throws Exception {
+ public void testCallQueueTooBigExceptionDoesntTriggerPffe() throws Exception {
Admin admin = TEST_UTIL.getHBaseAdmin();
final String tableName = "testCallQueueTooBigException";
@@ -340,7 +340,8 @@ public class TestFastFail {
} catch (Throwable ex) {
}
- assertEquals("There should have been 1 hit", 1,
+ assertEquals("We should have not entered PFFE mode on CQTBE, but we did;"
+ + " number of times this mode should have been entered:", 0,
CallQueueTooBigPffeInterceptor.numCallQueueTooBig.get());
newConf = HBaseConfiguration.create(TEST_UTIL.getConfiguration());