Skip to content

Add retry support for blocking LoadBalancer #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
OlgaMaciaszek merged 11 commits into from
Sep 24, 2020
Merged

Add retry support for blocking LoadBalancer #832

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1d44150
Add LoadBalancerProperties and BlockingLoadBalancedRetryPolicy. Add s…
OlgaMaciaszek Sep 22, 2020
08d6fd8
Add BlockingLoadBalancedRetryFactory
OlgaMaciaszek Sep 22, 2020
2e07d26
Move retry properties to LoadBalancerRetryProperties.
OlgaMaciaszek Sep 22, 2020
8cb08d5
Refactor and remove deprecations, fix checkstyle.
OlgaMaciaszek Sep 22, 2020
c84fa6a
Add BlockingLoadBalancedRetryPolicy to autoconfiguration. Set default…
OlgaMaciaszek Sep 23, 2020
f0d4bcc
Allow using @Order on LoadBalancedRetryFactory beans.
OlgaMaciaszek Sep 23, 2020
f8e0ab2
Add tests. Reformat tests. Add explanatory comments.
OlgaMaciaszek Sep 23, 2020
cde8b47
Add documentation.
OlgaMaciaszek Sep 23, 2020
ed8b59f
Fix javadoc.
OlgaMaciaszek Sep 23, 2020
e5e1f84
Fix docs after review.
OlgaMaciaszek Sep 24, 2020
e14e2e4
Change field name.
OlgaMaciaszek Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow using @order on LoadBalancedRetryFactory beans.
  • Loading branch information
@OlgaMaciaszek
OlgaMaciaszek committed Sep 23, 2020
commit f0d4bcc6d206cd711ecad505603b94bf8dfbaec9
12 changes: 7 additions & 5 deletions ...ain/java/org/springframework/cloud/client/loadbalancer/LoadBalancerAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.retry.support.RetryTemplate;
import org.springframework.web.client.RestTemplate;

/**
* Auto-configuration for Ribbon (client-side load balancing).
* Auto-configuration for blocking client-side load balancing.
*
* @author Spencer Gibb
* @author Dave Syer
Expand Down Expand Up @@ -79,7 +80,7 @@ public LoadBalancerRequestFactory loadBalancerRequestFactory(
static class LoadBalancerInterceptorConfig {

@Bean
public LoadBalancerInterceptor ribbonInterceptor(
public LoadBalancerInterceptor loadBalancerInterceptor(
LoadBalancerClient loadBalancerClient,
LoadBalancerRequestFactory requestFactory) {
return new LoadBalancerInterceptor(loadBalancerClient, requestFactory);
Expand Down Expand Up @@ -124,13 +125,14 @@ public static class RetryInterceptorAutoConfiguration {

@Bean
@ConditionalOnMissingBean
public RetryLoadBalancerInterceptor ribbonInterceptor(
public RetryLoadBalancerInterceptor loadBalancerRetryInterceptor(
LoadBalancerClient loadBalancerClient,
LoadBalancerRetryProperties properties,
LoadBalancerRequestFactory requestFactory,
LoadBalancedRetryFactory loadBalancedRetryFactory) {
List<LoadBalancedRetryFactory> loadBalancedRetryFactories) {
AnnotationAwareOrderComparator.sort(loadBalancedRetryFactories);
return new RetryLoadBalancerInterceptor(loadBalancerClient, properties,
requestFactory, loadBalancedRetryFactory);
requestFactory, loadBalancedRetryFactories.get(0));
}

@Bean
Expand Down