From bf765a20cda79ca15b10c879bb09daae7d4df920 Mon Sep 17 00:00:00 2001 From: Elliott Clark Date: Wed, 20 Jan 2016 01:12:46 -0800 Subject: [PATCH] HBASE-15137 CallTimeoutException should be grounds for PFFE --- .../apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 64cd03d..d44d5d8 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 @@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.exceptions.ConnectionClosingException; import org.apache.hadoop.hbase.exceptions.PreemptiveFastFailException; +import org.apache.hadoop.hbase.ipc.CallTimeoutException; import org.apache.hadoop.hbase.ipc.FailedServerException; import org.apache.hadoop.hbase.util.EnvironmentEdgeManager; import org.apache.hadoop.ipc.RemoteException; @@ -176,7 +177,7 @@ class PreemptiveFastFailInterceptor extends RetryingCallerInterceptor { Throwable t2 = translateException(t1); boolean isLocalException = !(t2 instanceof RemoteException); if (isLocalException && isConnectionException(t2)) { - couldNotCommunicateWithServer.setValue(true); + couldNotCommunicateWithServer.setValue(!(t2 instanceof CallTimeoutException)); handleFailureToServer(serverName, t2); } } @@ -225,7 +226,7 @@ class PreemptiveFastFailInterceptor extends RetryingCallerInterceptor { return (e instanceof SocketTimeoutException || e instanceof ConnectException || e instanceof ClosedChannelException || e instanceof SyncFailedException || e instanceof EOFException - || e instanceof TimeoutException + || e instanceof TimeoutException || e instanceof CallTimeoutException || e instanceof ConnectionClosingException || e instanceof FailedServerException); } -- 2.7.0