Skip to content
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

server: make overload manager non-optional #11777

Merged
merged 15 commits into from
Jul 14, 2020
Merged

server: make overload manager non-optional #11777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
09a4d7c
Make OverloadManager argument non-optional
akonradi Jun 17, 2020
76f494b
Make ThreadLocalOverloadState virtual
akonradi Jun 15, 2020
0a402c4
Fix formatting
akonradi Jun 26, 2020
2609dbe
Mark ThreadLocalOverloadState as thread-local
akonradi Jun 29, 2020
dac81f8
Address feedback on null overload manager
akonradi Jun 29, 2020
159f964
Address NullOverloadManager feedback
akonradi Jul 1, 2020
5f40260
Fix clang tidy issue
akonradi Jul 1, 2020
44ac271
Remove unused #include
akonradi Jul 1, 2020
7334861
Move TLS initialization to start()
akonradi Jul 2, 2020
438f711
Move admin initialization later
akonradi Jul 6, 2020
ed7e988
Merge remote-tracking branch 'upstream/master' into non-optional-om
akonradi Jul 7, 2020
3bc1f88
Simplify ThreadLocalOverloadStateImpl::setState
akonradi Jul 9, 2020
04053d4
Fix formatting
akonradi Jul 9, 2020
82146f6
Use correct macro for "this is never called"
akonradi Jul 10, 2020
c190617
Fix formatting
akonradi Jul 10, 2020
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
32 changes: 2 additions & 30 deletions include/envoy/server/overload_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,25 +33,8 @@ using OverloadActionCb = std::function<void(OverloadActionState)>;
*/
class ThreadLocalOverloadState : public ThreadLocal::ThreadLocalObject {
public:
const OverloadActionState& getState(const std::string& action) {
auto it = actions_.find(action);
if (it == actions_.end()) {
it = actions_.insert(std::make_pair(action, OverloadActionState::Inactive)).first;
}
return it->second;
}

void setState(const std::string& action, OverloadActionState state) {
auto it = actions_.find(action);
if (it == actions_.end()) {
actions_[action] = state;
} else {
it->second = state;
}
}

private:
std::unordered_map<std::string, OverloadActionState> actions_;
// Get a thread-local reference to the value for the given action key.
virtual const OverloadActionState& getState(const std::string& action) PURE;
};

/**
Expand Down Expand Up @@ -106,17 +89,6 @@ class OverloadManager {
* an alternative to registering a callback for overload action state changes.
*/
virtual ThreadLocalOverloadState& getThreadLocalOverloadState() PURE;

/**
* Convenience method to get a statically allocated reference to the inactive overload
* action state. Useful for code that needs to initialize a reference either to an
* entry in the ThreadLocalOverloadState map (if overload behavior is enabled) or to
* some other static memory location set to the inactive state (if overload behavior
* is disabled).
*/
static const OverloadActionState& getInactiveState() {
CONSTRUCT_ON_FIRST_USE(OverloadActionState, OverloadActionState::Inactive);
}
};

} // namespace Server
Expand Down
14 changes: 5 additions & 9 deletions source/common/http/conn_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ ConnectionManagerImpl::ConnectionManagerImpl(ConnectionManagerConfig& config,
Http::Context& http_context, Runtime::Loader& runtime,
const LocalInfo::LocalInfo& local_info,
Upstream::ClusterManager& cluster_manager,
Server::OverloadManager* overload_manager,
Server::OverloadManager& overload_manager,
TimeSource& time_source)
: config_(config), stats_(config_.stats()),
conn_length_(new Stats::HistogramCompletableTimespanImpl(
Expand All @@ -113,14 +113,10 @@ ConnectionManagerImpl::ConnectionManagerImpl(ConnectionManagerConfig& config,
random_generator_(random_generator), http_context_(http_context), runtime_(runtime),
local_info_(local_info), cluster_manager_(cluster_manager),
listener_stats_(config_.listenerStats()),
overload_stop_accepting_requests_ref_(
overload_manager ? overload_manager->getThreadLocalOverloadState().getState(
Server::OverloadActionNames::get().StopAcceptingRequests)
: Server::OverloadManager::getInactiveState()),
overload_disable_keepalive_ref_(
overload_manager ? overload_manager->getThreadLocalOverloadState().getState(
Server::OverloadActionNames::get().DisableHttpKeepAlive)
: Server::OverloadManager::getInactiveState()),
overload_stop_accepting_requests_ref_(overload_manager.getThreadLocalOverloadState().getState(
Server::OverloadActionNames::get().StopAcceptingRequests)),
overload_disable_keepalive_ref_(overload_manager.getThreadLocalOverloadState().getState(
Server::OverloadActionNames::get().DisableHttpKeepAlive)),
time_source_(time_source) {}

const ResponseHeaderMap& ConnectionManagerImpl::continueHeader() {
Expand Down
2 changes: 1 addition & 1 deletion source/common/http/conn_manager_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class ConnectionManagerImpl : Logger::Loggable<Logger::Id::http>,
Runtime::RandomGenerator& random_generator, Http::Context& http_context,
Runtime::Loader& runtime, const LocalInfo::LocalInfo& local_info,
Upstream::ClusterManager& cluster_manager,
Server::OverloadManager* overload_manager, TimeSource& time_system);
Server::OverloadManager& overload_manager, TimeSource& time_system);
~ConnectionManagerImpl() override;

static ConnectionManagerStats generateStats(const std::string& prefix, Stats::Scope& scope);
Expand Down
8 changes: 4 additions & 4 deletions source/extensions/filters/network/http_connection_manager/config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,8 +144,8 @@ HttpConnectionManagerFilterConfigFactory::createFilterFactoryFromProtoTyped(
return [singletons, filter_config, &context](Network::FilterManager& filter_manager) -> void {
filter_manager.addReadFilter(Network::ReadFilterSharedPtr{new Http::ConnectionManagerImpl(
*filter_config, context.drainDecision(), context.random(), context.httpContext(),
context.runtime(), context.localInfo(), context.clusterManager(),
&context.overloadManager(), context.dispatcher().timeSource())});
context.runtime(), context.localInfo(), context.clusterManager(), context.overloadManager(),
context.dispatcher().timeSource())});
};
}

Expand Down Expand Up @@ -591,8 +591,8 @@ HttpConnectionManagerFactory::createHttpConnectionManagerFactoryFromProto(
return [singletons, filter_config, &context, &read_callbacks]() -> Http::ApiListenerPtr {
auto conn_manager = std::make_unique<Http::ConnectionManagerImpl>(
*filter_config, context.drainDecision(), context.random(), context.httpContext(),
context.runtime(), context.localInfo(), context.clusterManager(),
&context.overloadManager(), context.dispatcher().timeSource());
context.runtime(), context.localInfo(), context.clusterManager(), context.overloadManager(),
context.dispatcher().timeSource());

// This factory creates a new ConnectionManagerImpl in the absence of its usual environment as
// an L4 filter, so this factory needs to take a few actions.
Expand Down
9 changes: 6 additions & 3 deletions source/server/admin/admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ void AdminImpl::startHttpListener(const std::string& access_log_path,
access_logs_.emplace_back(new Extensions::AccessLoggers::File::FileAccessLog(
access_log_path, {}, Formatter::SubstitutionFormatUtils::defaultSubstitutionFormatter(),
server_.accessLogManager()));
null_overload_manager_.start();
socket_ = std::make_shared<Network::TcpListenSocket>(address, socket_options, true);
socket_factory_ = std::make_shared<AdminListenSocketFactory>(socket_);
listener_ = std::make_unique<AdminListener>(*this, std::move(listener_scope));
Expand All @@ -679,6 +680,7 @@ AdminImpl::AdminImpl(const std::string& profile_path, Server::Instance& server)
request_id_extension_(Http::RequestIDExtensionFactory::defaultInstance(server_.random())),
profile_path_(profile_path),
stats_(Http::ConnectionManagerImpl::generateStats("http.admin.", server_.stats())),
null_overload_manager_(server_.threadLocal()),
tracing_stats_(
Http::ConnectionManagerImpl::generateTracingStats("http.admin.", no_op_store_)),
route_config_provider_(server.timeSource()),
Expand Down Expand Up @@ -760,11 +762,12 @@ Http::ServerConnectionPtr AdminImpl::createCodec(Network::Connection& connection

bool AdminImpl::createNetworkFilterChain(Network::Connection& connection,
const std::vector<Network::FilterFactoryCb>&) {
// Don't pass in the overload manager so that the admin interface is accessible even when
// the envoy is overloaded.
akonradi marked this conversation as resolved.
Show resolved Hide resolved
// Pass in the null overload manager so that the admin interface is accessible even when Envoy is
// overloaded.
connection.addReadFilter(Network::ReadFilterSharedPtr{new Http::ConnectionManagerImpl(
*this, server_.drainManager(), server_.random(), server_.httpContext(), server_.runtime(),
server_.localInfo(), server_.clusterManager(), nullptr, server_.timeSource())});
server_.localInfo(), server_.clusterManager(), null_overload_manager_,
server_.timeSource())});
return true;
}

Expand Down
36 changes: 36 additions & 0 deletions source/server/admin/admin.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,11 @@
#include "envoy/server/admin.h"
#include "envoy/server/instance.h"
#include "envoy/server/listener_manager.h"
#include "envoy/server/overload_manager.h"
#include "envoy/upstream/outlier_detection.h"
#include "envoy/upstream/resource_manager.h"

#include "common/common/assert.h"
#include "common/common/basic_resource_impl.h"
#include "common/common/empty_string.h"
#include "common/common/logger.h"
Expand Down Expand Up @@ -245,6 +247,39 @@ class AdminImpl : public Admin,
TimeSource& time_source_;
};

/**
* Implementation of OverloadManager that is never overloaded. Using this instead of the real
* OverloadManager keeps the admin interface accessible even when the proxy is overloaded.
*/
struct NullOverloadManager : public OverloadManager {
struct NullThreadLocalOverloadState : public ThreadLocalOverloadState {
const OverloadActionState& getState(const std::string&) override { return inactive_; }

const OverloadActionState inactive_ = OverloadActionState::Inactive;
};

NullOverloadManager(ThreadLocal::SlotAllocator& slot_allocator)
: tls_(slot_allocator.allocateSlot()) {}

void start() override {
Copy link
Contributor

Choose a reason for hiding this comment

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

is start() called?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, moved the TLS initialization to the constructor, which seems to work fine.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think you opted to use start() in the end.

Copy link
Contributor

Choose a reason for hiding this comment

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

What was the reasoning to keep this in start vs the ctor?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The constructor gets invoked with AdminImpl's constructor, which is invoked in server.cc before the TLS state is initialized. Putting this in start lets us defer it.

tls_->set([](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return std::make_shared<NullThreadLocalOverloadState>();
});
}

ThreadLocalOverloadState& getThreadLocalOverloadState() override {
Copy link
Contributor

Choose a reason for hiding this comment

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

const ThreadLocalOverloadState& since ThreadLocalOverloadState has no mutation methods as part of the interface.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don't want to make this const because I expect in the near future that we'll want non-const methods on here.

Copy link
Contributor

Choose a reason for hiding this comment

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

Tell me more about said non-const methods. I would expect OverloadManager to be the one doing all the updates to overload state resources. I'm guessing that you're referring to methods to create scalable timers, which in fact would need to be non-const.

That said, I wonder if scalable timers should be more closely integrated with the Event::Dispatcher interface.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, my concern is around adding methods to create scalable timers. I think we can discuss them in a separate issue, though, and leave this as-is here.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think my advice is to use the Event::Dispatcher interface to create scalable timers. We can discuss in the PR that defines that API.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think I'd prefer to make this const for now and then remove it down the line if we start needing non-const access, just so we don't accidentally leave this non-const.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Finally gave it a try and it turns out that won't work since getState() is non-const. getState is non-const because it looks up a key in the internal state map and creates an entry for it if one doesn't exist.

Copy link
Contributor

Choose a reason for hiding this comment

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

It is strange that getState returns a reference instead of a value. State is a primitive type (an enum)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The callers hold onto the reference to avoid extra map lookups

return tls_->getTyped<NullThreadLocalOverloadState>();
}

bool registerForAction(const std::string&, Event::Dispatcher&, OverloadActionCb) override {
// This method shouldn't be called by the admin listener
NOT_REACHED_GCOVR_EXCL_LINE;
return false;
akonradi marked this conversation as resolved.
Show resolved Hide resolved
}

ThreadLocal::SlotPtr tls_;
};

/**
* Helper methods for the /clusters url handler.
*/
Expand Down Expand Up @@ -389,6 +424,7 @@ class AdminImpl : public Admin,
std::list<AccessLog::InstanceSharedPtr> access_logs_;
const std::string profile_path_;
Http::ConnectionManagerStats stats_;
NullOverloadManager null_overload_manager_;
// Note: this is here to essentially blackhole the tracing stats since they aren't used in the
// Admin case.
Stats::IsolatedStoreImpl no_op_store_;
Expand Down
25 changes: 22 additions & 3 deletions source/server/overload_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,25 @@ class ThresholdTriggerImpl : public OverloadAction::Trigger {
absl::optional<double> value_;
};

/**
* Thread-local copy of the state of each configured overload action.
*/
class ThreadLocalOverloadStateImpl : public ThreadLocalOverloadState {
public:
const OverloadActionState& getState(const std::string& action) override {
auto it = actions_.find(action);
if (it == actions_.end()) {
it = actions_.insert(std::make_pair(action, OverloadActionState::Inactive)).first;
}
return it->second;
}

void setState(const std::string& action, OverloadActionState state) { actions_[action] = state; }

private:
std::unordered_map<std::string, OverloadActionState> actions_;
};

Stats::Counter& makeCounter(Stats::Scope& scope, absl::string_view a, absl::string_view b) {
Stats::StatNameManagedStorage stat_name(absl::StrCat("overload.", a, ".", b),
scope.symbolTable());
Expand Down Expand Up @@ -148,7 +167,7 @@ void OverloadManagerImpl::start() {
started_ = true;

tls_->set([](Event::Dispatcher&) -> ThreadLocal::ThreadLocalObjectSharedPtr {
return std::make_shared<ThreadLocalOverloadState>();
return std::make_shared<ThreadLocalOverloadStateImpl>();
});

if (resources_.empty()) {
Expand Down Expand Up @@ -191,7 +210,7 @@ bool OverloadManagerImpl::registerForAction(const std::string& action,
}

ThreadLocalOverloadState& OverloadManagerImpl::getThreadLocalOverloadState() {
return tls_->getTyped<ThreadLocalOverloadState>();
return tls_->getTyped<ThreadLocalOverloadStateImpl>();
}

void OverloadManagerImpl::updateResourcePressure(const std::string& resource, double pressure) {
Expand All @@ -208,7 +227,7 @@ void OverloadManagerImpl::updateResourcePressure(const std::string& resource, do
ENVOY_LOG(info, "Overload action {} became {}", action,
is_active ? "active" : "inactive");
tls_->runOnAllThreads([this, action, state] {
tls_->getTyped<ThreadLocalOverloadState>().setState(action, state);
tls_->getTyped<ThreadLocalOverloadStateImpl>().setState(action, state);
});
auto callback_range = action_to_callbacks_.equal_range(action);
std::for_each(callback_range.first, callback_range.second,
Expand Down
35 changes: 18 additions & 17 deletions source/server/server.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,23 +382,6 @@ void InstanceImpl::initialize(const Options& options,
// Learn original_start_time_ if our parent is still around to inform us of it.
restarter_.sendParentAdminShutdownRequest(original_start_time_);
admin_ = std::make_unique<AdminImpl>(initial_config.admin().profilePath(), *this);
if (initial_config.admin().address()) {
if (initial_config.admin().accessLogPath().empty()) {
throw EnvoyException("An admin access log path is required for a listening server.");
}
ENVOY_LOG(info, "admin address: {}", initial_config.admin().address()->asString());
admin_->startHttpListener(initial_config.admin().accessLogPath(), options.adminAddressPath(),
initial_config.admin().address(),
initial_config.admin().socketOptions(),
stats_store_.createScope("listener.admin."));
} else {
ENVOY_LOG(warn, "No admin address given, so no admin HTTP server started.");
}
config_tracker_entry_ =
admin_->getConfigTracker().add("bootstrap", [this] { return dumpBootstrapConfig(); });
if (initial_config.admin().address()) {
admin_->addListenerToHandler(handler_.get());
}

loadServerFlags(initial_config.flagsPath());

Expand Down Expand Up @@ -428,6 +411,24 @@ void InstanceImpl::initialize(const Options& options,
dispatcher_->initializeStats(stats_store_, "server.");
}

if (initial_config.admin().address()) {
Copy link
Contributor

Choose a reason for hiding this comment

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

What specific action you need to happen first? Is it the "thread_local_.registerThread(*dispatcher_, true);"

Does worker initialization happen before or after this point?

I wonder if initialization is still happening too early and possible consequences for internal admin API users which bypass request handling on the admin port.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep, that's the line. The worker initialization happens before, in the ListenerManagerImpl constructor.

if (initial_config.admin().accessLogPath().empty()) {
throw EnvoyException("An admin access log path is required for a listening server.");
}
ENVOY_LOG(info, "admin address: {}", initial_config.admin().address()->asString());
admin_->startHttpListener(initial_config.admin().accessLogPath(), options.adminAddressPath(),
initial_config.admin().address(),
initial_config.admin().socketOptions(),
stats_store_.createScope("listener.admin."));
} else {
ENVOY_LOG(warn, "No admin address given, so no admin HTTP server started.");
}
config_tracker_entry_ =
admin_->getConfigTracker().add("bootstrap", [this] { return dumpBootstrapConfig(); });
if (initial_config.admin().address()) {
admin_->addListenerToHandler(handler_.get());
}

// The broad order of initialization from this point on is the following:
// 1. Statically provisioned configuration (bootstrap) are loaded.
// 2. Cluster manager is created and all primary clusters (i.e. with endpoint assignments
Expand Down
1 change: 1 addition & 0 deletions test/common/http/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ envoy_cc_fuzz_test(
"//test/mocks/network:network_mocks",
"//test/mocks/router:router_mocks",
"//test/mocks/runtime:runtime_mocks",
"//test/mocks/server:server_mocks",
"//test/mocks/ssl:ssl_mocks",
"//test/mocks/tracing:tracing_mocks",
"//test/mocks/upstream:upstream_mocks",
Expand Down
4 changes: 3 additions & 1 deletion test/common/http/conn_manager_impl_fuzz_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include "test/mocks/network/mocks.h"
#include "test/mocks/router/mocks.h"
#include "test/mocks/runtime/mocks.h"
#include "test/mocks/server/mocks.h"
#include "test/mocks/ssl/mocks.h"
#include "test/mocks/tracing/mocks.h"
#include "test/mocks/upstream/mocks.h"
Expand Down Expand Up @@ -541,6 +542,7 @@ DEFINE_PROTO_FUZZER(const test::common::http::ConnManagerImplTestCase& input) {
NiceMock<LocalInfo::MockLocalInfo> local_info;
NiceMock<Upstream::MockClusterManager> cluster_manager;
NiceMock<Network::MockReadFilterCallbacks> filter_callbacks;
NiceMock<Server::MockOverloadManager> overload_manager;
auto ssl_connection = std::make_shared<Ssl::MockConnectionInfo>();
bool connection_alive = true;

Expand All @@ -554,7 +556,7 @@ DEFINE_PROTO_FUZZER(const test::common::http::ConnManagerImplTestCase& input) {
std::make_shared<Network::Address::Ipv4Instance>("0.0.0.0");

ConnectionManagerImpl conn_manager(config, drain_close, random, http_context, runtime, local_info,
cluster_manager, nullptr, config.time_system_);
cluster_manager, overload_manager, config.time_system_);
conn_manager.initializeReadFilterCallbacks(filter_callbacks);

std::vector<FuzzStreamPtr> streams;
Expand Down
19 changes: 11 additions & 8 deletions test/common/http/conn_manager_impl_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class HttpConnectionManagerImplTest : public testing::Test, public ConnectionMan
std::make_shared<Network::Address::Ipv4Instance>("0.0.0.0");
conn_manager_ = std::make_unique<ConnectionManagerImpl>(
*this, drain_close_, random_, http_context_, runtime_, local_info_, cluster_manager_,
&overload_manager_, test_time_.timeSystem());
overload_manager_, test_time_.timeSystem());
conn_manager_->initializeReadFilterCallbacks(filter_callbacks_);

if (tracing) {
Expand Down Expand Up @@ -5601,11 +5601,12 @@ TEST(HttpConnectionManagerTracingStatsTest, verifyTracingStats) {
}

TEST_F(HttpConnectionManagerImplTest, NoNewStreamWhenOverloaded) {
setup(false, "");
Server::OverloadActionState stop_accepting_requests = Server::OverloadActionState::Active;
ON_CALL(overload_manager_.overload_state_,
getState(Server::OverloadActionNames::get().StopAcceptingRequests))
.WillByDefault(ReturnRef(stop_accepting_requests));

overload_manager_.overload_state_.setState(
Server::OverloadActionNames::get().StopAcceptingRequests,
Server::OverloadActionState::Active);
setup(false, "");

EXPECT_CALL(*codec_, dispatch(_)).WillRepeatedly(Invoke([&](Buffer::Instance&) -> Http::Status {
RequestDecoder* decoder = &conn_manager_->newStream(response_encoder_);
Expand All @@ -5631,10 +5632,12 @@ TEST_F(HttpConnectionManagerImplTest, NoNewStreamWhenOverloaded) {
}

TEST_F(HttpConnectionManagerImplTest, DisableKeepAliveWhenOverloaded) {
setup(false, "");
Server::OverloadActionState disable_http_keep_alive = Server::OverloadActionState::Active;
ON_CALL(overload_manager_.overload_state_,
getState(Server::OverloadActionNames::get().DisableHttpKeepAlive))
.WillByDefault(ReturnRef(disable_http_keep_alive));

overload_manager_.overload_state_.setState(
Server::OverloadActionNames::get().DisableHttpKeepAlive, Server::OverloadActionState::Active);
setup(false, "");

std::shared_ptr<MockStreamDecoderFilter> filter(new NiceMock<MockStreamDecoderFilter>());
EXPECT_CALL(filter_factory_, createFilterChain(_))
Expand Down
6 changes: 6 additions & 0 deletions test/mocks/server/overload_manager.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ namespace Envoy {
namespace Server {

using ::testing::ReturnRef;

MockThreadLocalOverloadState::MockThreadLocalOverloadState()
: disabled_state_(OverloadActionState::Inactive) {
ON_CALL(*this, getState).WillByDefault(ReturnRef(disabled_state_));
}

MockOverloadManager::MockOverloadManager() {
ON_CALL(*this, getThreadLocalOverloadState()).WillByDefault(ReturnRef(overload_state_));
}
Expand Down
Loading