[incubator-servicecomb-java-chassis] branch master updated: [SCB-833] IOException do not trigger retry mechanism

[li...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 5754914  [SCB-833] IOException do not trigger retry mechanism
5754914 is described below

commit 5754914da908c722b13efff8c8ec27209a45cd9d
Author: yaohaishi <ya...@huawei.com>
AuthorDate: Tue Aug 14 19:48:39 2018 +0800

    [SCB-833] IOException do not trigger retry mechanism
---
 .../apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java  | 3 +--
 .../java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java
index 118fe0c..ea23aca 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/DefaultRetryExtensionsFactory.java
@@ -16,7 +16,6 @@
  */
 package org.apache.servicecomb.loadbalance;
 
-import java.io.IOException;
 import java.net.ConnectException;
 import java.net.SocketTimeoutException;
 import java.util.Collection;
@@ -51,7 +50,7 @@ public class DefaultRetryExtensionsFactory implements ExtensionsFactory {
         Configuration.INSTANCE.getRetryOnSame(microservice),
         Configuration.INSTANCE.getRetryOnNext(microservice), true) {
       private List<Class<? extends Throwable>> retriable = Lists
-          .newArrayList(new Class[] {ConnectException.class, SocketTimeoutException.class, IOException.class});
+          .newArrayList(new Class[] {ConnectException.class, SocketTimeoutException.class});
 
       @Override
       public boolean isRetriableException(Throwable e, boolean sameServer) {
diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java
index c0070ca..69c4a1e 100644
--- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java
+++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestExtensionsManager.java
@@ -123,6 +123,6 @@ public class TestExtensionsManager {
     Assert.assertTrue(retryHandler.isRetriableException(new ConnectException(), true));
     Assert.assertTrue(retryHandler.isRetriableException(new SocketTimeoutException(), false));
     Assert.assertTrue(retryHandler.isRetriableException(new SocketTimeoutException(), true));
-    Assert.assertTrue(retryHandler.isRetriableException(new IOException(), true));
+    Assert.assertFalse(retryHandler.isRetriableException(new IOException(), true));
   }
 }