-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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.
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
http: dumping session state on the decode path #7390
Changes from 2 commits
d260dcd
ac93703
e0c631d
b17c382
4939235
e5c0d31
ce554b7
42e27ba
41d620a
e8bbe34
56ccb5a
510534e
9e31cd1
f0b1519
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
#pragma once | ||
|
||
#include <ostream> | ||
|
||
#include "envoy/common/pure.h" | ||
|
||
namespace Envoy { | ||
|
||
/* | ||
* A class for tracking the scope of work. | ||
* Currently this is only used for best-effort tracking the any L7 stream doing | ||
* work if a crash occurs. | ||
*/ | ||
class ScopeTrackedObject { | ||
public: | ||
virtual ~ScopeTrackedObject() {} | ||
|
||
/** | ||
* Dump debug state of the object in question to the provided ostream | ||
* | ||
* @param os the ostream to output to. | ||
* @param indent_level how far to indent, for pretty-printed classes and subclasses. | ||
*/ | ||
virtual void logState(std::ostream& os, int indent_level = 0) const PURE; | ||
htuch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
}; | ||
|
||
} // namespace Envoy |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
#pragma once | ||
|
||
#include <sstream> | ||
|
||
namespace Envoy { | ||
|
||
#define LOG_MEMBER(member) ", " #member ": " << (member) | ||
|
||
#define LOG_OPTIONAL_MEMBER(member) \ | ||
", " #member ": " << (member.has_value() ? absl::StrCat(member.value()) : "null") | ||
|
||
// Macro assumes local member variables | ||
// os (ostream) | ||
// indent_level (int) | ||
#define LOG_DETAILS(member) \ | ||
do { \ | ||
os << spaces << #member ": "; \ | ||
if (member != nullptr) { \ | ||
os << "\n"; \ | ||
(member)->logState(os, indent_level + 1); \ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not a huge fan of this style of printing and indenting TBH. I get that you want to make this efficient and have no allocations, but it's leaking through above into a duck typing of a pure interface (the header map), which seems like a pattern best avoided across if it's going to appear in more places. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah, to your point I think there is value in having a structured data print type, and I can think of several use cases where it'd be valuable internally. From (possibly outdated?) priors I believe there is also value in a minimal allocation state drop, which is what I planned on implementing first. I think for out-process communication and machine-consumption we'll eventually want to tackle the latter, but I don't think we'd want to use that version in the fatal error handler and I'd like the "core dumps are hard" session state to be human readable where possible. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a fair point. I think it would be useful to document (i.e. provide the citations) on how allocations during fatal handling are a problem. The main one I can imagine is that we're in a soft OOM situation, and allocation would lead to a hard OOM, would be good to have some more intuition on this one. |
||
} else { \ | ||
os << spaces << "null\n"; \ | ||
} \ | ||
} while (false) | ||
|
||
// Return the const char* equivalent of string(level*2, ' '), without dealing | ||
// with string creation overhead. Cap arbitrarily at 6 as we're (hopefully) | ||
// not going to have nested objects deeper than that. | ||
inline const char* spacesForLevel(int level) { | ||
htuch marked this conversation as resolved.
Show resolved
Hide resolved
|
||
switch (level) { | ||
case 0: | ||
return ""; | ||
case 1: | ||
return " "; | ||
case 2: | ||
return " "; | ||
case 3: | ||
return " "; | ||
case 4: | ||
return " "; | ||
case 5: | ||
return " "; | ||
default: | ||
return " "; | ||
} | ||
return ""; | ||
} | ||
|
||
} // namespace Envoy |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
#pragma once | ||
|
||
#include "envoy/common/scope_tracker.h" | ||
#include "envoy/event/dispatcher.h" | ||
|
||
namespace Envoy { | ||
|
||
class ScopeTrackerImpl { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: I might call this There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this name is better future-proofed for when we use the scope object for customer memory/cpu accounting (the htuch@ feature) - WDYT? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't feel strongly about it, other than to say that There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. (I guess a small class comment on what it is for would be nice either way) |
||
public: | ||
ScopeTrackerImpl(const ScopeTrackedObject* object, Event::Dispatcher& dispatcher) | ||
: dispatcher_(dispatcher) { | ||
latched_object_ = dispatcher_.setTrackedObject(object); | ||
} | ||
|
||
~ScopeTrackerImpl() { dispatcher_.setTrackedObject(latched_object_); } | ||
|
||
private: | ||
const ScopeTrackedObject* latched_object_; | ||
Event::Dispatcher& dispatcher_; | ||
}; | ||
|
||
} // namespace Envoy |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -21,6 +21,7 @@ | |
#include "common/common/empty_string.h" | ||
#include "common/common/enum_to_int.h" | ||
#include "common/common/fmt.h" | ||
#include "common/common/scope_tracker.h" | ||
#include "common/common/utility.h" | ||
#include "common/http/codes.h" | ||
#include "common/http/conn_manager_utility.h" | ||
|
@@ -416,6 +417,8 @@ ConnectionManagerImpl::ActiveStream::ActiveStream(ConnectionManagerImpl& connect | |
connection_manager_.stats_.named_.downstream_rq_time_, connection_manager_.timeSource())), | ||
stream_info_(connection_manager_.codec_->protocol(), connection_manager_.timeSource()), | ||
upstream_options_(std::make_shared<Network::Socket::Options>()) { | ||
ScopeTrackerImpl scope(this, connection_manager_.read_callbacks_->connection().dispatcher()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. How did you pick the places where you setup the tracked scope? Can we document in comments somewhere? It seems like we should be potentially tracking the encode side as well? Filter continuations? Etc.? I wonder if there is some more generic way we could do this? Nothing immediately comes to mind but I figured I would throw it out there. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. That's in PR description - I'm going to do encode side (from the router filter) as well as alarms for L7 in follow-ups :-) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. OK sounds good. |
||
|
||
connection_manager_.stats_.named_.downstream_rq_total_.inc(); | ||
connection_manager_.stats_.named_.downstream_rq_active_.inc(); | ||
if (connection_manager_.codec_->protocol() == Protocol::Http2) { | ||
|
@@ -585,6 +588,7 @@ const Network::Connection* ConnectionManagerImpl::ActiveStream::connection() { | |
// TODO(alyssawilk) all the calls here should be audited for order priority, | ||
// e.g. many early returns do not currently handle connection: close properly. | ||
void ConnectionManagerImpl::ActiveStream::decodeHeaders(HeaderMapPtr&& headers, bool end_stream) { | ||
ScopeTrackerImpl scope(this, connection_manager_.read_callbacks_->connection().dispatcher()); | ||
request_headers_ = std::move(headers); | ||
if (Http::Headers::get().MethodValues.Head == | ||
request_headers_->Method()->value().getStringView()) { | ||
|
@@ -881,6 +885,7 @@ void ConnectionManagerImpl::ActiveStream::decodeHeaders(ActiveStreamDecoderFilte | |
} | ||
|
||
void ConnectionManagerImpl::ActiveStream::decodeData(Buffer::Instance& data, bool end_stream) { | ||
ScopeTrackerImpl scope(this, connection_manager_.read_callbacks_->connection().dispatcher()); | ||
maybeEndDecode(end_stream); | ||
stream_info_.addBytesReceived(data.length()); | ||
|
||
|
@@ -890,6 +895,7 @@ void ConnectionManagerImpl::ActiveStream::decodeData(Buffer::Instance& data, boo | |
void ConnectionManagerImpl::ActiveStream::decodeData( | ||
ActiveStreamDecoderFilter* filter, Buffer::Instance& data, bool end_stream, | ||
FilterIterationStartState filter_iteration_start_state) { | ||
ScopeTrackerImpl scope(this, connection_manager_.read_callbacks_->connection().dispatcher()); | ||
resetIdleTimer(); | ||
|
||
// If we previously decided to decode only the headers, do nothing here. | ||
|
@@ -1029,6 +1035,7 @@ void ConnectionManagerImpl::ActiveStream::addDecodedData(ActiveStreamDecoderFilt | |
} | ||
|
||
void ConnectionManagerImpl::ActiveStream::decodeTrailers(HeaderMapPtr&& trailers) { | ||
ScopeTrackerImpl scope(this, connection_manager_.read_callbacks_->connection().dispatcher()); | ||
resetIdleTimer(); | ||
maybeEndDecode(true); | ||
request_trailers_ = std::move(trailers); | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/the any/any ?