Skip to content

router: remove unused internal redirects member variable #17946

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
mattklein123 merged 1 commit into from
Sep 3, 2021
Merged

router: remove unused internal redirects member variable #17946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 2 additions & 18 deletions source/common/router/router.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,7 +1299,7 @@ void Filter::onUpstreamHeaders(uint64_t response_code, Http::ResponseHeaderMapPt
if (route_entry_->internalRedirectPolicy().enabled() &&
route_entry_->internalRedirectPolicy().shouldRedirectForResponseCode(
static_cast<Http::Code>(response_code)) &&
setupRedirect(*headers, upstream_request)) {
setupRedirect(*headers)) {
return;
// If the redirect could not be handled, fail open and let it pass to the
// next downstream.
Expand Down Expand Up @@ -1471,24 +1471,10 @@ void Filter::onUpstreamComplete(UpstreamRequest& upstream_request) {
cleanup();
}

bool Filter::setupRedirect(const Http::ResponseHeaderMap& headers,
UpstreamRequest& upstream_request) {
bool Filter::setupRedirect(const Http::ResponseHeaderMap& headers) {
ENVOY_STREAM_LOG(debug, "attempting internal redirect", *callbacks_);
const Http::HeaderEntry* location = headers.Location();

// If the internal redirect succeeds, callbacks_->recreateStream() will result in the
// destruction of this filter before the stream is marked as complete, and onDestroy will reset
// the stream.
//
// Normally when a stream is complete we signal this by resetting the upstream but this cannot
// be done in this case because if recreateStream fails, the "failure" path continues to call
// code in onUpstreamHeaders which requires the upstream *not* be reset. To avoid onDestroy
// performing a spurious stream reset in the case recreateStream() succeeds, we explicitly track
// stream completion here and check it in onDestroy. This is annoyingly complicated but is
// better than needlessly resetting streams.
attempting_internal_redirect_with_complete_stream_ =
upstream_request.upstreamTiming().last_upstream_rx_byte_received_ && downstream_end_stream_;

const uint64_t status_code = Http::Utility::getResponseStatus(headers);

// Redirects are not supported for streaming requests yet.
Expand All @@ -1502,8 +1488,6 @@ bool Filter::setupRedirect(const Http::ResponseHeaderMap& headers,
return true;
}

attempting_internal_redirect_with_complete_stream_ = false;

ENVOY_STREAM_LOG(debug, "Internal redirect failed", *callbacks_);
cluster_->stats().upstream_internal_redirect_failed_total_.inc();
return false;
Expand Down
7 changes: 2 additions & 5 deletions source/common/router/router.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,9 +285,7 @@ class Filter : Logger::Loggable<Logger::Id::router>,
Filter(FilterConfig& config)
: config_(config), final_upstream_request_(nullptr),
downstream_100_continue_headers_encoded_(false), downstream_response_started_(false),
downstream_end_stream_(false), is_retry_(false),
attempting_internal_redirect_with_complete_stream_(false),
request_buffer_overflowed_(false) {}
downstream_end_stream_(false), is_retry_(false), request_buffer_overflowed_(false) {}

~Filter() override;

Expand Down Expand Up @@ -497,7 +495,7 @@ class Filter : Logger::Loggable<Logger::Id::router>,
// for the remaining upstream requests to return.
void resetOtherUpstreams(UpstreamRequest& upstream_request);
void sendNoHealthyUpstreamResponse();
bool setupRedirect(const Http::ResponseHeaderMap& headers, UpstreamRequest& upstream_request);
bool setupRedirect(const Http::ResponseHeaderMap& headers);
bool convertRequestHeadersForInternalRedirect(Http::RequestHeaderMap& downstream_headers,
const Http::HeaderEntry& internal_redirect,
uint64_t status_code);
Expand Down Expand Up @@ -544,7 +542,6 @@ class Filter : Logger::Loggable<Logger::Id::router>,
bool downstream_end_stream_ : 1;
bool is_retry_ : 1;
bool include_attempt_count_in_request_ : 1;
bool attempting_internal_redirect_with_complete_stream_ : 1;
bool request_buffer_overflowed_ : 1;
bool internal_redirects_with_body_enabled_ : 1;
uint32_t attempt_count_{1};
Expand Down