Improved Connection Count server select strategy #15975
Merged
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
Comment on lines
507
to
512
| catch (RuntimeException e) { | ||
| if (openConnections.get() > 0) { | ||
| openConnections.getAndDecrement(); | ||
| } | ||
| throw e; | ||
| } |
There was a problem hiding this comment.
This could be moved to after httpClient.go call. Also, why not decrement the counter for any exception and why is there a check on get() > 0
There was a problem hiding this comment.
added just to be on safe side, But it will never happen. Will remove the condition.
Comment on lines
149
to
155
| EasyMock.expect( | ||
| httpClient.go( | ||
| EasyMock.capture(capturedRequest), | ||
| EasyMock.<HttpResponseHandler>anyObject(), | ||
| EasyMock.anyObject(Duration.class) | ||
| ) | ||
| ) | ||
| httpClient.go( | ||
| EasyMock.capture(capturedRequest), | ||
| EasyMock.<HttpResponseHandler>anyObject(), | ||
| EasyMock.anyObject(Duration.class) | ||
| ) | ||
| ) |
There was a problem hiding this comment.
This re-formatting shouldn't have happened. Are you using a different checkstyle?
| @@ -427,4 +431,47 @@ public void testQueryTimeoutFromFuture() | |||
| Assert.assertEquals(hostName, actualException.getHost()); | |||
| EasyMock.verify(httpClient); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testRuntimeException() throws JsonProcessingException | |||
There was a problem hiding this comment.
This is too generic test name. I would suggest testConnectionCountAfterException
| public void testRuntimeException() throws JsonProcessingException | ||
| { | ||
| ObjectMapper mockObjectMapper = EasyMock.createMock(ObjectMapper.class); | ||
| EasyMock.expect(mockObjectMapper.writeValueAsBytes(EasyMock.anyObject())) |
There was a problem hiding this comment.
lets intercept this call only when an object of type query is being serialized.
abhishekagarwal87
approved these changes
Mar 4, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #XXXX.
Description
Updated the Direct Druid Client so as to make Connection Count Server Selector Strategy work more efficiently.
If creating connection to a node is slow, then that slowness wouldn't be accounted for if we count the open connections after sending the request. So we increment the counter and then send the request.
Fixed the bug ...
Currently if a connection of server is blocked in creating a future job to run the query, it is not being counted resulting in the selector strategy allotting a new connection to same server.
Fixed this behaviour by incrementing the connection count prior to the start of future.
Release note
Key changed/added classes in this PR
DirectDruidClientDirectDruidClientTestThis PR has: