-
Notifications
You must be signed in to change notification settings - Fork 717
Avoid retrying on same instance #834
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.
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
Merged
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
c5c366b
cherry-pick switching to properties
OlgaMaciaszek cd6335d
Pass information on previous ServiceInstance to RequestContext.
OlgaMaciaszek 80087fe
Add a RoundRobinLoadBalancer implementation that avoids same service …
OlgaMaciaszek ffa65fa
Wrap instances in ArrayList. Add tests.
OlgaMaciaszek cc8b65d
Enable AvoidPreviousInstanceRoundRobinLoadBalancer by default if Spri…
OlgaMaciaszek 45f45e6
Fix failing tests. Add javadocs and author tags.
OlgaMaciaszek f5c9fee
Fix properties.
OlgaMaciaszek c71c670
Add documentation.
OlgaMaciaszek 3a5df47
Fix docs after review.
OlgaMaciaszek fd013b4
Fix docs after review.
OlgaMaciaszek d612436
Handle avoiding previous instance with ServiceInstanceListSupplier in…
OlgaMaciaszek c17457c
Fix property name.
OlgaMaciaszek 1d90b7e
Change spelling.
OlgaMaciaszek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 0 additions & 105 deletions
105
.../main/java/org/springframework/cloud/client/loadbalancer/LoadBalancerRetryProperties.java
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
.../src/main/java/org/springframework/cloud/client/loadbalancer/RetryableRequestContext.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/* | ||
* Copyright 2012-2020 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* https://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.cloud.client.loadbalancer; | ||
|
||
import org.springframework.cloud.client.ServiceInstance; | ||
|
||
/** | ||
* A request context object that allows storing information on previously used service | ||
* instances. | ||
* | ||
* @author Olga Maciaszek-Sharma | ||
*/ | ||
public class RetryableRequestContext extends DefaultRequestContext { | ||
|
||
private final ServiceInstance previousServiceInstance; | ||
|
||
public RetryableRequestContext(ServiceInstance previousServiceInstance) { | ||
this.previousServiceInstance = previousServiceInstance; | ||
} | ||
|
||
public RetryableRequestContext(ServiceInstance previousServiceInstance, Object clientRequest) { | ||
super(clientRequest); | ||
this.previousServiceInstance = previousServiceInstance; | ||
} | ||
|
||
public RetryableRequestContext(ServiceInstance previousServiceInstance, Object clientRequest, String hint) { | ||
super(clientRequest, hint); | ||
this.previousServiceInstance = previousServiceInstance; | ||
} | ||
|
||
public ServiceInstance getPreviousServiceInstance() { | ||
return previousServiceInstance; | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.