upstream: consistent H1 and H2 rq_total stats#6352
Merged
mattklein123 merged 2 commits intoenvoyproxy:masterfrom Mar 23, 2019
Merged
upstream: consistent H1 and H2 rq_total stats#6352mattklein123 merged 2 commits intoenvoyproxy:masterfrom
mattklein123 merged 2 commits intoenvoyproxy:masterfrom
Conversation
Previously, we incremented rq_total and upstream_rq_total in the HTTP/1 conn pool even if the request ended up being circuit broken. The stats were not incremented for HTTP/2 requests. This change no longer increments the stats for HTTP/1 circuit broken requests for consistency between the two. Signed-off-by: Spencer Lewis <slewis@squareup.com>
mattklein123
requested changes
Mar 22, 2019
Member
mattklein123
left a comment
There was a problem hiding this comment.
Thanks so much for jumping on this. 1 small comment. Also, do you mind adding a release note? I think it's fine to just change this since it makes more sense, but probably worth a note.
/wait
| host_->cluster().stats().upstream_rq_total_.inc(); | ||
| host_->stats().rq_total_.inc(); | ||
| if (!ready_clients_.empty()) { | ||
| host_->cluster().stats().upstream_rq_total_.inc(); |
Member
There was a problem hiding this comment.
Can you potentially move this into attachRequestToCleint() and remove from below? I think it's better to have the logic in one place and it's more accurate since we still may not send the request upstream if it gets cancelled while pending.
Contributor
Author
There was a problem hiding this comment.
This makes sense to me, thanks for catching that pending request case.
Signed-off-by: Spencer Lewis <slewis@squareup.com>
|
🙀 failed invoking rebuild of |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Description: Previously, we incremented rq_total and upstream_rq_total for the HTTP/1
conn pool even if the request ended up being circuit broken. The stats
were not incremented for HTTP/2 requests. This change no longer
increments the stats for HTTP/1 circuit broken requests for consistency
between the two.
Risk Level: Low
Testing: Added checks to an existing unit test
Docs Changes: N/A
Release Notes: N/A
Fixes #6350