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.

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

test: use test-only resource monitor in overload manager integration test #13135

Merged
merged 4 commits into from
Sep 21, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
2 changes: 1 addition & 1 deletion test/common/config/dummy_config.proto
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Provides protos for testing source/common/config/config_provider_impl.{h,cc}.
// Provides protos for testing.

syntax = "proto3";

Expand Down
2 changes: 1 addition & 1 deletion test/integration/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -1019,7 +1019,7 @@ envoy_cc_test(
tags = ["flaky_on_windows"],
deps = [
":http_protocol_integration_lib",
"//source/extensions/resource_monitors/injected_resource:config",
"//test/common/config:dummy_config_proto_cc_proto",
"@envoy_api//envoy/config/bootstrap/v3:pkg_cc_proto",
"@envoy_api//envoy/config/overload/v3:pkg_cc_proto",
],
Expand Down
102 changes: 85 additions & 17 deletions test/integration/overload_integration_test.cc
Original file line number Diff line number Diff line change
@@ -1,58 +1,126 @@
#include <unordered_map>

#include "envoy/config/bootstrap/v3/bootstrap.pb.h"
#include "envoy/config/overload/v3/overload.pb.h"
#include "envoy/server/resource_monitor.h"
#include "envoy/server/resource_monitor_config.h"

#include "test/common/config/dummy_config.pb.h"
#include "test/integration/http_protocol_integration.h"
#include "test/test_common/registry.h"

#include "absl/strings/str_cat.h"

namespace Envoy {

class FakeResourceMonitorFactory;

class FakeResourceMonitor : public Server::ResourceMonitor {
public:
static constexpr absl::string_view kName =
"envoy.resource_monitors.testonly.fake_resource_monitor";

FakeResourceMonitor(Event::Dispatcher& dispatcher, FakeResourceMonitorFactory& factory)
: dispatcher_(dispatcher), factory_(factory), pressure_(0.0) {}
~FakeResourceMonitor() override;
void updateResourceUsage(Callbacks& callbacks) override;

void setResourcePressure(double pressure) {
dispatcher_.post([this, pressure] { pressure_ = pressure; });
}

private:
Event::Dispatcher& dispatcher_;
FakeResourceMonitorFactory& factory_;
double pressure_;
};

class FakeResourceMonitorFactory : public Server::Configuration::ResourceMonitorFactory {
public:
FakeResourceMonitor* monitor() const { return monitor_; }
Server::ResourceMonitorPtr
createResourceMonitor(const Protobuf::Message& config,
Server::Configuration::ResourceMonitorFactoryContext& context) override;

ProtobufTypes::MessagePtr createEmptyConfigProto() override {
return std::make_unique<test::common::config::DummyConfig>();
}

std::string name() const override { return std::string(FakeResourceMonitor::kName); }
akonradi marked this conversation as resolved.
Show resolved Hide resolved

void onMonitorDestroyed(FakeResourceMonitor* monitor);

private:
FakeResourceMonitor* monitor_{nullptr};
};

FakeResourceMonitor::~FakeResourceMonitor() { factory_.onMonitorDestroyed(this); }

void FakeResourceMonitor::updateResourceUsage(Callbacks& callbacks) {
Server::ResourceUsage usage;
usage.resource_pressure_ = pressure_;
callbacks.onSuccess(usage);
}

void FakeResourceMonitorFactory::onMonitorDestroyed(FakeResourceMonitor* monitor) {
if (monitor_ == monitor) {
akonradi marked this conversation as resolved.
Show resolved Hide resolved
monitor_ = nullptr;
}
}

Server::ResourceMonitorPtr FakeResourceMonitorFactory::createResourceMonitor(
const Protobuf::Message&, Server::Configuration::ResourceMonitorFactoryContext& context) {
auto monitor = std::make_unique<FakeResourceMonitor>(context.dispatcher(), *this);
monitor_ = monitor.get();
return monitor;
}

class OverloadIntegrationTest : public HttpProtocolIntegrationTest {
protected:
OverloadIntegrationTest()
: injected_resource_filename_(TestEnvironment::temporaryPath("injected_resource")),
file_updater_(injected_resource_filename_) {}

void initialize() override {
config_helper_.addConfigModifier([this](envoy::config::bootstrap::v3::Bootstrap& bootstrap) {
const std::string overload_config = fmt::format(R"EOF(
config_helper_.addConfigModifier([](envoy::config::bootstrap::v3::Bootstrap& bootstrap) {
const std::string overload_config = R"EOF(
refresh_interval:
seconds: 0
nanos: 1000000
resource_monitors:
- name: "envoy.resource_monitors.injected_resource"
- name: "envoy.resource_monitors.testonly.fake_resource_monitor"
typed_config:
"@type": type.googleapis.com/envoy.config.resource_monitor.injected_resource.v2alpha.InjectedResourceConfig
filename: "{}"
"@type": type.googleapis.com/google.protobuf.Empty
actions:
- name: "envoy.overload_actions.stop_accepting_requests"
triggers:
- name: "envoy.resource_monitors.injected_resource"
- name: "envoy.resource_monitors.testonly.fake_resource_monitor"
threshold:
value: 0.9
- name: "envoy.overload_actions.disable_http_keepalive"
triggers:
- name: "envoy.resource_monitors.injected_resource"
- name: "envoy.resource_monitors.testonly.fake_resource_monitor"
threshold:
value: 0.8
- name: "envoy.overload_actions.stop_accepting_connections"
triggers:
- name: "envoy.resource_monitors.injected_resource"
- name: "envoy.resource_monitors.testonly.fake_resource_monitor"
threshold:
value: 0.95
)EOF",
injected_resource_filename_);
)EOF";
*bootstrap.mutable_overload_manager() =
TestUtility::parseYaml<envoy::config::overload::v3::OverloadManager>(overload_config);
});
updateResource(0);
HttpIntegrationTest::initialize();
}

void updateResource(double pressure) { file_updater_.update(absl::StrCat(pressure)); }
void updateResource(double pressure) {
auto* monitor = fake_resource_monitor_factory_.monitor();
if (monitor != nullptr) {
akonradi marked this conversation as resolved.
Show resolved Hide resolved
monitor->setResourcePressure(pressure);
}
}

const std::string injected_resource_filename_;
AtomicFileUpdater file_updater_;
FakeResourceMonitorFactory fake_resource_monitor_factory_;
Registry::InjectFactory<Server::Configuration::ResourceMonitorFactory> inject_factory_{
fake_resource_monitor_factory_};
};

INSTANTIATE_TEST_SUITE_P(Protocols, OverloadIntegrationTest,
Expand Down