test: fix ratelimit_integration_test flake introduced in #2434.#2443
Merged
htuch merged 1 commit intoenvoyproxy:masterfrom Jan 24, 2018
Merged
test: fix ratelimit_integration_test flake introduced in #2434.#2443htuch merged 1 commit intoenvoyproxy:masterfrom
htuch merged 1 commit intoenvoyproxy:masterfrom
Conversation
mrice32
approved these changes
Jan 24, 2018
| switch (clientType()) { | ||
| case Grpc::ClientType::EnvoyGrpc: | ||
| test_server_->waitForCounterGe("cluster.ratelimit.upstream_rq_timeout", 1); | ||
| test_server_->waitForCounterGe("cluster.ratelimit.upstream_rq_504", 1); |
Member
There was a problem hiding this comment.
Just curious, why do we not need to wait on streams_total to be incremented below, too?
Member
Author
There was a problem hiding this comment.
The Google gRPC client increments streams_total when .streams come to life and then increments streams_closed_<grpc status code> when they close. So, it's sufficient to wait on the close. For Envoy gRPC, it appears that rq_timeout is bumped before rq_504. Could have just waiting on rq_504 I suppose, but belts-and-braces.
Member
There was a problem hiding this comment.
Gotcha. Makes sense. It probably makes sense to not depend on implementation defined order of modification for timeout and 504 anyway.
dnoe
approved these changes
Jan 24, 2018
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
4 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.
Signed-off-by: Harvey Tuch htuch@google.com