SpringCloud/spring-cloud-openfeign
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable loadbalancer clients retry when clients retry is disabled (fixed) (#773)

Browse Source
This commit is contained in:
정원식
2022-10-19 00:11:03 +09:00
committed by GitHub
parent 5b0f9f74af
commit 561acf6276
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClient.java
View File

@@ -65,6 +65,7 @@ import static org.springframework.cloud.openfeign.loadbalancer.LoadBalancerUtils
* load-balanced with Spring Cloud LoadBalancer.
*
* @author Olga Maciaszek-Sharma
* @author Wonsik Cheung
* @since 2.2.6
*/
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -201,8 +202,10 @@ public class RetryableFeignBlockingLoadBalancerClient implements Client {
retryTemplate.setListeners(retryListeners);
}
retryTemplate.setRetryPolicy(retryPolicy == null ? new NeverRetryPolicy()
: new InterceptorRetryPolicy(toHttpRequest(request), retryPolicy, loadBalancerClient, serviceId));
retryTemplate.setRetryPolicy(
!loadBalancerClientFactory.getProperties(serviceId).getRetry().isEnabled() || retryPolicy == null
? new NeverRetryPolicy() : new InterceptorRetryPolicy(toHttpRequest(request), retryPolicy,
loadBalancerClient, serviceId));
return retryTemplate;
}

16
spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/RetryableFeignBlockingLoadBalancerClientTests.java
View File

@@ -55,6 +55,7 @@ import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
@@ -72,6 +73,7 @@ import static org.mockito.Mockito.when;
* @see <a href=
* "https://github.com/spring-cloud/spring-cloud-commons/blob/main/spring-cloud-loadbalancer/src/test/java/org/springframework/cloud/loadbalancer/blocking/client/BlockingLoadBalancerClientTests.java">BlockingLoadBalancerClientTests</a>
* @author Olga Maciaszek-Sharma
* @author Wonsik Cheung
*/
@ExtendWith(MockitoExtension.class)
class RetryableFeignBlockingLoadBalancerClientTests {
@@ -160,6 +162,20 @@ class RetryableFeignBlockingLoadBalancerClientTests {
verify(delegate, times(2)).execute(any(), any());
}
@Test
void shouldNotRetryOnDisabled() throws IOException {
properties.getRetry().setEnabled(false);
Request request = testRequest();
when(delegate.execute(any(), any())).thenThrow(new IOException());
when(retryFactory.createRetryPolicy(any(), eq(loadBalancerClient)))
.thenReturn(new BlockingLoadBalancedRetryPolicy(properties));
assertThatThrownBy(() -> feignBlockingLoadBalancerClient.execute(request, new Request.Options()))
.isInstanceOf(IOException.class);
verify(delegate, times(1)).execute(any(), any());
}
@Test
void shouldExposeResponseBodyOnRetry() throws IOException {
properties.getRetry().getRetryableStatusCodes().add(503);