This repository has been archived by the owner on Jul 27, 2023. It is now read-only.
Fix bug that overwrites query options for blocking timeout #1
Conversation
This file contains 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
rickfast
added a commit
that referenced
this pull request
Oct 9, 2014
Fix bug that overwrites query options for blocking timeout
rickfast
pushed a commit
that referenced
this pull request
Dec 24, 2014
Fix XML node closing in README
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When we call into the health client from consul-service-discovery, we set the query options:
healthClient.getHealthyNodesAsync(serviceName, builder().blockMinutes(TIMEOUT_IN_MINS, startIndex).build(), consulDiscoveryCallback);
When we provide a timeout value like this, the builder marks the "blocking" flag as true in the query options. But then we are guaranteed to overwrite the timeout values that we set because of the logic below (isBlocking() is true if "wait" has been set to any value)
public static void response(WebTarget target, CatalogOptions catalogOptions,
QueryOptions queryOptions,
GenericType type,
ConsulResponseCallback callback) {
if(queryOptions.isBlocking()) {
queryOptions = QueryOptionsBuilder.builder().queryOptions(queryOptions)
.blockMinutes(5, queryOptions.getIndex()).build();
}
I think we can simply remove this block. If it is blocking, then someone has already set the timeout in the query options.