Skip to content

router: defer per try timeout until downstream request is done #6643

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snowp merged 6 commits into from
Apr 20, 2019
Merged

router: defer per try timeout until downstream request is done #6643

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6fbed66
router: defer per try timeout until downstream request is done
Apr 18, 2019
53c4da4
format
Apr 18, 2019
681ebce
fix log test
Apr 18, 2019
856c859
move pending flag to upstream request
Apr 18, 2019
56a63cb
rename flag + add version history note
Apr 19, 2019
f9d11ac
fix typos
Apr 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docs/root/intro/version_history.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ Version history
* redis: added :ref:`prefix routing <envoy_api_field_config.filter.network.redis_proxy.v2.RedisProxy.prefix_routes>` to enable routing commands based on their key's prefix to different upstream.
* redis: add support for zpopmax and zpopmin commands.
* router: added ability to control retry back-off intervals via :ref:`retry policy <envoy_api_msg_route.RetryPolicy.RetryBackOff>`.
* router: per try timeouts will no longer start before the downstream request has been received
in full by the router. This ensure that the per try timeout does not account for slow

@mattklein123 mattklein123 Apr 20, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/ensure/ensures

downstreams and that will not not start before the global timeout.

@mattklein123 mattklein123 Apr 20, 2019

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not not (not)

* upstream: added :ref:`upstream_cx_pool_overflow <config_cluster_manager_cluster_stats>` for the connection pool circuit breaker.

1.10.0 (Apr 5, 2019)
Expand Down
6 changes: 3 additions & 3 deletions source/common/router/router.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ void Filter::onRequestComplete() {
}

for (auto& upstream_request : upstream_requests_) {
if (upstream_request->pending_per_try_timeout_) {
if (upstream_request->create_per_try_timeout_on_request_complete_) {
upstream_request->setupPerTryTimeout();
}
}
Expand Down Expand Up @@ -992,7 +992,7 @@ Filter::UpstreamRequest::UpstreamRequest(Filter& parent, Http::ConnectionPool::I
: parent_(parent), conn_pool_(pool), grpc_rq_success_deferred_(false),
stream_info_(pool.protocol(), parent_.callbacks_->dispatcher().timeSource()),
calling_encode_headers_(false), upstream_canary_(false), encode_complete_(false),
encode_trailers_(false), pending_per_try_timeout_(false) {
encode_trailers_(false), create_per_try_timeout_on_request_complete_(false) {

if (parent_.config_.start_child_span_) {
span_ = parent_.callbacks_->activeSpan().spawnChild(
Expand Down Expand Up @@ -1195,7 +1195,7 @@ void Filter::UpstreamRequest::onPoolReady(Http::StreamEncoder& request_encoder,
if (parent_.downstream_end_stream_) {
setupPerTryTimeout();
} else {
pending_per_try_timeout_ = true;
create_per_try_timeout_on_request_complete_ = true;
}

conn_pool_stream_handle_ = nullptr;
Expand Down
2 changes: 1 addition & 1 deletion source/common/router/router.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ class Filter : Logger::Loggable<Logger::Id::router>,
bool encode_trailers_ : 1;
// Tracks whether we deferred a per try timeout because the downstream request
// had not been completed yet.
bool pending_per_try_timeout_ : 1;
bool create_per_try_timeout_on_request_complete_ : 1;
};

typedef std::unique_ptr<UpstreamRequest> UpstreamRequestPtr;
Expand Down