fix(server): count http calls in connection guard #1468
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
lexnv
approved these changes
Oct 7, 2024
jsdw
reviewed
Oct 7, 2024
server/src/server.rs
Outdated
Comment on lines
1157
to
1159
| let rp = http::response::denied(); | ||
| drop(conn); | ||
| Box::pin(async { Ok(rp) }) |
There was a problem hiding this comment.
I guess this is just a tidy up and isn't changing any semantics right?
There was a problem hiding this comment.
Yupp, it was to make it more verbose that it wasn't any async code but I can revert it if you want.
There was a problem hiding this comment.
I added a comment for this instead. I'm not super happy with the drop stuff here because it's easy to mess up but fine for now.
jsdw
reviewed
Oct 7, 2024
| let rp = | ||
| http::call_with_service(request, batch_config, max_request_size, rpc_service, max_response_size) | ||
| .await; | ||
| drop(conn); |
There was a problem hiding this comment.
And this is the main bit; droping here to pull it into the async function after the await.
Perhaps worth a comment to make clear we are dropping it for this reaosn?
jsdw
approved these changes
Oct 7, 2024
pkhry
approved these changes
Oct 7, 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.
Close #1467
The ConnectionGuard was dropped before actually waiting for the http future to resolved which this fixes by enforcing RpcService to take ownership of ConnectionState.