[hotfix][tests] Strip CompletionExceptions in MiniClusterClient#guard…

…WithSingleRetry
Hexiaoqiao · Mar 12, 2018 · d5fc25e · d5fc25e
1 parent 7cea425
commit d5fc25e
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/MiniClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/MiniClusterClient.java
@@ -38,6 +38,7 @@
 import org.apache.flink.runtime.util.ExecutorThreadFactory;
 import org.apache.flink.runtime.util.LeaderConnectionInfo;
 import org.apache.flink.runtime.util.LeaderRetrievalUtils;
+import org.apache.flink.util.ExceptionUtils;
 import org.apache.flink.util.FlinkException;
 
 import javax.annotation.Nonnull;
@@ -197,7 +198,10 @@ private static <X> CompletableFuture<X> guardWithSingleRetry(Supplier<Completabl
  operation,
  1,
  Time.milliseconds(500),
- throwable -> throwable instanceof FencingTokenException || throwable instanceof AkkaRpcException,
+ throwable -> {
+ Throwable actualException = ExceptionUtils.stripCompletionException(throwable);
+ return actualException instanceof FencingTokenException || actualException instanceof AkkaRpcException;
+ },
  executor);
  }
 }