From a8bebb9d00f16493dd0f23ff3332fc6fb2137be8 Mon Sep 17 00:00:00 2001 From: Alex Konradi Date: Fri, 23 Oct 2020 17:27:25 -0400 Subject: [PATCH 1/2] Split thread_local_object.h and overload_manager.h Splitting these will prevent circular dependencies when the Dispatcher references thread-local overload state. Signed-off-by: Alex Konradi --- include/envoy/runtime/BUILD | 2 +- include/envoy/runtime/runtime.h | 2 +- include/envoy/server/BUILD | 18 ++---- include/envoy/server/factory_context.h | 2 +- include/envoy/server/instance.h | 2 +- include/envoy/server/overload/BUILD | 29 +++++++++ .../server/{ => overload}/overload_manager.h | 55 +--------------- .../overload/thread_local_overload_state.h | 63 +++++++++++++++++++ include/envoy/server/worker.h | 2 +- include/envoy/thread_local/BUILD | 12 +++- include/envoy/thread_local/thread_local.h | 23 +------ .../envoy/thread_local/thread_local_object.h | 33 ++++++++++ source/common/grpc/BUILD | 2 +- source/common/grpc/google_async_client_impl.h | 2 +- source/common/http/BUILD | 2 +- source/common/http/conn_manager_impl.h | 2 +- source/common/memory/BUILD | 2 +- source/common/memory/heap_shrinker.h | 2 +- source/extensions/common/wasm/BUILD | 1 + source/extensions/common/wasm/wasm.h | 2 +- .../filters/http/admission_control/BUILD | 1 + .../thread_local_controller.h | 2 +- source/server/BUILD | 2 +- source/server/admin/admin.h | 2 +- source/server/overload_manager_impl.cc | 1 - source/server/overload_manager_impl.h | 2 +- test/mocks/server/BUILD | 4 +- test/mocks/server/main.h | 2 +- test/mocks/server/overload_manager.h | 3 +- test/server/overload_manager_impl_test.cc | 2 +- 30 files changed, 169 insertions(+), 110 deletions(-) create mode 100644 include/envoy/server/overload/BUILD rename include/envoy/server/{ => overload}/overload_manager.h (57%) create mode 100644 include/envoy/server/overload/thread_local_overload_state.h create mode 100644 include/envoy/thread_local/thread_local_object.h diff --git a/include/envoy/runtime/BUILD b/include/envoy/runtime/BUILD index b80d180dedaa..f28a5af6a50e 100644 --- a/include/envoy/runtime/BUILD +++ b/include/envoy/runtime/BUILD @@ -17,7 +17,7 @@ envoy_cc_library( ], deps = [ "//include/envoy/stats:stats_interface", - "//include/envoy/thread_local:thread_local_interface", + "//include/envoy/thread_local:thread_local_object", "//source/common/common:assert_lib", "//source/common/singleton:threadsafe_singleton", "@envoy_api//envoy/type/v3:pkg_cc_proto", diff --git a/include/envoy/runtime/runtime.h b/include/envoy/runtime/runtime.h index 72aa2e90fb28..27264a1f9e58 100644 --- a/include/envoy/runtime/runtime.h +++ b/include/envoy/runtime/runtime.h @@ -9,7 +9,7 @@ #include "envoy/common/pure.h" #include "envoy/stats/store.h" -#include "envoy/thread_local/thread_local.h" +#include "envoy/thread_local/thread_local_object.h" #include "envoy/type/v3/percent.pb.h" #include "common/common/assert.h" diff --git a/include/envoy/server/BUILD b/include/envoy/server/BUILD index 30b3d46b1c56..a9f7854ba1c2 100644 --- a/include/envoy/server/BUILD +++ b/include/envoy/server/BUILD @@ -127,7 +127,7 @@ envoy_cc_library( "//include/envoy/local_info:local_info_interface", "//include/envoy/runtime:runtime_interface", "//include/envoy/secret:secret_manager_interface", - "//include/envoy/server:overload_manager_interface", + "//include/envoy/server/overload:overload_manager_interface", "//include/envoy/ssl:context_manager_interface", "//include/envoy/thread_local:thread_local_interface", "//include/envoy/tracing:http_tracer_interface", @@ -151,8 +151,8 @@ envoy_cc_library( name = "worker_interface", hdrs = ["worker.h"], deps = [ - ":overload_manager_interface", "//include/envoy/server:guarddog_interface", + "//include/envoy/server/overload:overload_manager_interface", ], ) @@ -183,7 +183,7 @@ envoy_cc_library( "//include/envoy/local_info:local_info_interface", "//include/envoy/network:drain_decision_interface", "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:overload_manager_interface", + "//include/envoy/server/overload:overload_manager_interface", "//include/envoy/singleton:manager_interface", "//include/envoy/thread_local:thread_local_interface", "//include/envoy/tracing:http_tracer_interface", @@ -207,8 +207,8 @@ envoy_cc_library( "//include/envoy/config:typed_config_interface", "//include/envoy/http:codes_interface", "//include/envoy/http:filter_interface", - "//include/envoy/server:overload_manager_interface", "//include/envoy/server:transport_socket_config_interface", + "//include/envoy/server/overload:overload_manager_interface", "//include/envoy/singleton:manager_interface", "//include/envoy/thread_local:thread_local_interface", "//include/envoy/tracing:http_tracer_interface", @@ -302,16 +302,6 @@ envoy_cc_library( ], ) -envoy_cc_library( - name = "overload_manager_interface", - hdrs = ["overload_manager.h"], - deps = [ - "//include/envoy/event:timer_interface", - "//include/envoy/thread_local:thread_local_interface", - "//source/common/singleton:const_singleton", - ], -) - envoy_cc_library( name = "tracer_config_interface", hdrs = ["tracer_config.h"], diff --git a/include/envoy/server/factory_context.h b/include/envoy/server/factory_context.h index 7d496a6d2eb4..01ffee80f763 100644 --- a/include/envoy/server/factory_context.h +++ b/include/envoy/server/factory_context.h @@ -19,7 +19,7 @@ #include "envoy/server/admin.h" #include "envoy/server/drain_manager.h" #include "envoy/server/lifecycle_notifier.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "envoy/server/process_context.h" #include "envoy/singleton/manager.h" #include "envoy/stats/scope.h" diff --git a/include/envoy/server/instance.h b/include/envoy/server/instance.h index 8bba884e8b47..338479f5ea2a 100644 --- a/include/envoy/server/instance.h +++ b/include/envoy/server/instance.h @@ -23,7 +23,7 @@ #include "envoy/server/lifecycle_notifier.h" #include "envoy/server/listener_manager.h" #include "envoy/server/options.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "envoy/ssl/context_manager.h" #include "envoy/thread_local/thread_local.h" #include "envoy/tracing/http_tracer.h" diff --git a/include/envoy/server/overload/BUILD b/include/envoy/server/overload/BUILD new file mode 100644 index 000000000000..990a306c7fd4 --- /dev/null +++ b/include/envoy/server/overload/BUILD @@ -0,0 +1,29 @@ +load( + "//bazel:envoy_build_system.bzl", + "envoy_cc_library", + "envoy_package", +) + +licenses(["notice"]) # Apache 2 + +envoy_package() + +envoy_cc_library( + name = "overload_manager_interface", + hdrs = ["overload_manager.h"], + deps = [ + ":thread_local_overload_state", + "//include/envoy/event:dispatcher_interface", + "//include/envoy/thread_local:thread_local_interface", + "//source/common/singleton:const_singleton", + ], +) + +envoy_cc_library( + name = "thread_local_overload_state", + hdrs = ["thread_local_overload_state.h"], + deps = [ + "//include/envoy/event:timer_interface", + "//include/envoy/thread_local:thread_local_object", + ], +) diff --git a/include/envoy/server/overload_manager.h b/include/envoy/server/overload/overload_manager.h similarity index 57% rename from include/envoy/server/overload_manager.h rename to include/envoy/server/overload/overload_manager.h index 47e9fe0af51e..a4b42a7c9fad 100644 --- a/include/envoy/server/overload_manager.h +++ b/include/envoy/server/overload/overload_manager.h @@ -3,64 +3,13 @@ #include #include "envoy/common/pure.h" -#include "envoy/event/timer.h" -#include "envoy/thread_local/thread_local.h" +#include "envoy/event/dispatcher.h" +#include "envoy/server/overload/thread_local_overload_state.h" -#include "common/common/macros.h" #include "common/singleton/const_singleton.h" namespace Envoy { namespace Server { - -/** - * Tracks the state of an overload action. The state is a number between 0 and 1 that represents the - * level of saturation. The values are categorized in two groups: - * - Saturated (value = 1): indicates that an overload action is active because at least one of its - * triggers has reached saturation. - * - Scaling (0 <= value < 1): indicates that an overload action is not saturated. - */ -class OverloadActionState { -public: - static constexpr OverloadActionState inactive() { return OverloadActionState(0); } - - static constexpr OverloadActionState saturated() { return OverloadActionState(1.0); } - - explicit constexpr OverloadActionState(float value) - : action_value_(std::min(1.0f, std::max(0.0f, value))) {} - - float value() const { return action_value_; } - bool isSaturated() const { return action_value_ == 1; } - -private: - float action_value_; -}; - -/** - * Callback invoked when an overload action changes state. - */ -using OverloadActionCb = std::function; - -enum class OverloadTimerType { - // Timers created with this type will never be scaled. This should only be used for testing. - UnscaledRealTimerForTest, - // The amount of time an HTTP connection to a downstream client can remain idle (no streams). This - // corresponds to the HTTP_DOWNSTREAM_CONNECTION_IDLE TimerType in overload.proto. - HttpDownstreamIdleConnectionTimeout, -}; - -/** - * Thread-local copy of the state of each configured overload action. - */ -class ThreadLocalOverloadState : public ThreadLocal::ThreadLocalObject { -public: - // Get a thread-local reference to the value for the given action key. - virtual const OverloadActionState& getState(const std::string& action) PURE; - - // Get a scaled timer whose minimum corresponds to the configured value for the given timer type. - virtual Event::TimerPtr createScaledTimer(OverloadTimerType timer_type, - Event::TimerCb callback) PURE; -}; - /** * Well-known overload action names. */ diff --git a/include/envoy/server/overload/thread_local_overload_state.h b/include/envoy/server/overload/thread_local_overload_state.h new file mode 100644 index 000000000000..6c94fab5cd42 --- /dev/null +++ b/include/envoy/server/overload/thread_local_overload_state.h @@ -0,0 +1,63 @@ + +#pragma once + +#include + +#include "envoy/common/pure.h" +#include "envoy/event/timer.h" +#include "envoy/thread_local/thread_local_object.h" + +namespace Envoy { +namespace Server { + +/** + * Tracks the state of an overload action. The state is a number between 0 and 1 that represents the + * level of saturation. The values are categorized in two groups: + * - Saturated (value = 1): indicates that an overload action is active because at least one of its + * triggers has reached saturation. + * - Scaling (0 <= value < 1): indicates that an overload action is not saturated. + */ +class OverloadActionState { +public: + static constexpr OverloadActionState inactive() { return OverloadActionState(0); } + + static constexpr OverloadActionState saturated() { return OverloadActionState(1.0); } + + explicit constexpr OverloadActionState(float value) + : action_value_(std::min(1.0f, std::max(0.0f, value))) {} + + float value() const { return action_value_; } + bool isSaturated() const { return action_value_ == 1; } + +private: + float action_value_; +}; + +/** + * Callback invoked when an overload action changes state. + */ +using OverloadActionCb = std::function; + +enum class OverloadTimerType { + // Timers created with this type will never be scaled. This should only be used for testing. + UnscaledRealTimerForTest, + // The amount of time an HTTP connection to a downstream client can remain idle (no streams). This + // corresponds to the HTTP_DOWNSTREAM_CONNECTION_IDLE TimerType in overload.proto. + HttpDownstreamIdleConnectionTimeout, +}; + +/** + * Thread-local copy of the state of each configured overload action. + */ +class ThreadLocalOverloadState : public ThreadLocal::ThreadLocalObject { +public: + // Get a thread-local reference to the value for the given action key. + virtual const OverloadActionState& getState(const std::string& action) PURE; + + // Get a scaled timer whose minimum corresponds to the configured value for the given timer type. + virtual Event::TimerPtr createScaledTimer(OverloadTimerType timer_type, + Event::TimerCb callback) PURE; +}; + +} // namespace Server +} // namespace Envoy diff --git a/include/envoy/server/worker.h b/include/envoy/server/worker.h index 9d6ed578cfbe..762cf83005e7 100644 --- a/include/envoy/server/worker.h +++ b/include/envoy/server/worker.h @@ -3,7 +3,7 @@ #include #include "envoy/server/guarddog.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" namespace Envoy { namespace Server { diff --git a/include/envoy/thread_local/BUILD b/include/envoy/thread_local/BUILD index 3b23de4e0175..9a5e61235494 100644 --- a/include/envoy/thread_local/BUILD +++ b/include/envoy/thread_local/BUILD @@ -11,5 +11,15 @@ envoy_package() envoy_cc_library( name = "thread_local_interface", hdrs = ["thread_local.h"], - deps = ["//include/envoy/event:dispatcher_interface"], + deps = [ + ":thread_local_object", + "//include/envoy/event:dispatcher_interface", + "//source/common/common:assert_lib", + ], +) + +envoy_cc_library( + name = "thread_local_object", + hdrs = ["thread_local_object.h"], + deps = ["//source/common/common:assert_lib"], ) diff --git a/include/envoy/thread_local/thread_local.h b/include/envoy/thread_local/thread_local.h index 4993b118d1eb..8ff2ca99c8c0 100644 --- a/include/envoy/thread_local/thread_local.h +++ b/include/envoy/thread_local/thread_local.h @@ -7,30 +7,13 @@ #include "envoy/common/optref.h" #include "envoy/common/pure.h" #include "envoy/event/dispatcher.h" +#include "envoy/thread_local/thread_local_object.h" + +#include "common/common/assert.h" namespace Envoy { namespace ThreadLocal { -/** - * All objects that are stored via the ThreadLocal interface must derive from this type. - */ -class ThreadLocalObject { -public: - virtual ~ThreadLocalObject() = default; - - /** - * Return the object casted to a concrete type. See getTyped() below for comments on the casts. - */ - template T& asType() { - ASSERT(dynamic_cast(this) != nullptr); - return *static_cast(this); - } -}; - -using ThreadLocalObjectSharedPtr = std::shared_ptr; - -template class TypedSlot; - /** * An individual allocated TLS slot. When the slot is destroyed the stored thread local will * be freed on each thread. diff --git a/include/envoy/thread_local/thread_local_object.h b/include/envoy/thread_local/thread_local_object.h new file mode 100644 index 000000000000..0944c8c5299a --- /dev/null +++ b/include/envoy/thread_local/thread_local_object.h @@ -0,0 +1,33 @@ +#pragma once + +#include +#include +#include + +#include "common/common/assert.h" + +namespace Envoy { +namespace ThreadLocal { + +/** +* All objects that are stored via the ThreadLocal interface must derive from this type. +*/ +class ThreadLocalObject { +public: + virtual ~ThreadLocalObject() = default; + + /** + * Return the object casted to a concrete type. See getTyped() below for comments on the casts. + */ + template T& asType() { + ASSERT(dynamic_cast(this) != nullptr); + return *static_cast(this); + } +}; + +using ThreadLocalObjectSharedPtr = std::shared_ptr; + +template class TypedSlot; + +} // namespace ThreadLocal +} // namespace Envoy diff --git a/source/common/grpc/BUILD b/source/common/grpc/BUILD index 3837cadc79d0..79b0eea9b9f3 100644 --- a/source/common/grpc/BUILD +++ b/source/common/grpc/BUILD @@ -171,7 +171,7 @@ envoy_cc_library( "//include/envoy/api:api_interface", "//include/envoy/grpc:google_grpc_creds_interface", "//include/envoy/thread:thread_interface", - "//include/envoy/thread_local:thread_local_interface", + "//include/envoy/thread_local:thread_local_object", "//source/common/common:base64_lib", "//source/common/common:empty_string", "//source/common/common:linked_object", diff --git a/source/common/grpc/google_async_client_impl.h b/source/common/grpc/google_async_client_impl.h index a0e27c5e5efd..c3ea7f4c12d4 100644 --- a/source/common/grpc/google_async_client_impl.h +++ b/source/common/grpc/google_async_client_impl.h @@ -10,7 +10,7 @@ #include "envoy/grpc/async_client.h" #include "envoy/stats/scope.h" #include "envoy/thread/thread.h" -#include "envoy/thread_local/thread_local.h" +#include "envoy/thread_local/thread_local_object.h" #include "envoy/tracing/http_tracer.h" #include "common/common/linked_object.h" diff --git a/source/common/http/BUILD b/source/common/http/BUILD index e5a2d719d369..01798486ffef 100644 --- a/source/common/http/BUILD +++ b/source/common/http/BUILD @@ -216,7 +216,7 @@ envoy_cc_library( "//include/envoy/router:rds_interface", "//include/envoy/router:scopes_interface", "//include/envoy/runtime:runtime_interface", - "//include/envoy/server:overload_manager_interface", + "//include/envoy/server/overload:overload_manager_interface", "//include/envoy/ssl:connection_interface", "//include/envoy/stats:stats_interface", "//include/envoy/stats:stats_macros", diff --git a/source/common/http/conn_manager_impl.h b/source/common/http/conn_manager_impl.h index 4922a19c392d..828f8ceb30e4 100644 --- a/source/common/http/conn_manager_impl.h +++ b/source/common/http/conn_manager_impl.h @@ -26,7 +26,7 @@ #include "envoy/router/rds.h" #include "envoy/router/scopes.h" #include "envoy/runtime/runtime.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "envoy/ssl/connection.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats_macros.h" diff --git a/source/common/memory/BUILD b/source/common/memory/BUILD index 45cc04041baa..1fe67e534e49 100644 --- a/source/common/memory/BUILD +++ b/source/common/memory/BUILD @@ -35,7 +35,7 @@ envoy_cc_library( deps = [ ":utils_lib", "//include/envoy/event:dispatcher_interface", - "//include/envoy/server:overload_manager_interface", + "//include/envoy/server/overload:overload_manager_interface", "//include/envoy/stats:stats_interface", "//source/common/stats:symbol_table_lib", ], diff --git a/source/common/memory/heap_shrinker.h b/source/common/memory/heap_shrinker.h index 6c4a88bfbbb2..9b1930f2bb06 100644 --- a/source/common/memory/heap_shrinker.h +++ b/source/common/memory/heap_shrinker.h @@ -1,7 +1,7 @@ #pragma once #include "envoy/event/dispatcher.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" diff --git a/source/extensions/common/wasm/BUILD b/source/extensions/common/wasm/BUILD index 02eb727951c1..f620531ced2c 100644 --- a/source/extensions/common/wasm/BUILD +++ b/source/extensions/common/wasm/BUILD @@ -32,6 +32,7 @@ envoy_cc_library( "//include/envoy/http:codes_interface", "//include/envoy/http:filter_interface", "//include/envoy/server:lifecycle_notifier_interface", + "//include/envoy/thread_local:thread_local_object", "//include/envoy/upstream:cluster_manager_interface", "//source/common/config:datasource_lib", "//source/common/singleton:const_singleton", diff --git a/source/extensions/common/wasm/wasm.h b/source/extensions/common/wasm/wasm.h index a812d1a1a522..08cf6ed636c0 100644 --- a/source/extensions/common/wasm/wasm.h +++ b/source/extensions/common/wasm/wasm.h @@ -11,7 +11,7 @@ #include "envoy/server/lifecycle_notifier.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" -#include "envoy/thread_local/thread_local.h" +#include "envoy/thread_local/thread_local_object.h" #include "envoy/upstream/cluster_manager.h" #include "common/common/assert.h" diff --git a/source/extensions/filters/http/admission_control/BUILD b/source/extensions/filters/http/admission_control/BUILD index 07acbda5fe58..9dab0fc8f6bc 100644 --- a/source/extensions/filters/http/admission_control/BUILD +++ b/source/extensions/filters/http/admission_control/BUILD @@ -25,6 +25,7 @@ envoy_cc_extension( deps = [ "//include/envoy/http:filter_interface", "//include/envoy/runtime:runtime_interface", + "//include/envoy/thread_local:thread_local_object", "//source/common/common:cleanup_lib", "//source/common/http:codes_lib", "//source/common/runtime:runtime_lib", diff --git a/source/extensions/filters/http/admission_control/thread_local_controller.h b/source/extensions/filters/http/admission_control/thread_local_controller.h index 11f938758177..fde56131ecd8 100644 --- a/source/extensions/filters/http/admission_control/thread_local_controller.h +++ b/source/extensions/filters/http/admission_control/thread_local_controller.h @@ -3,7 +3,7 @@ #include "envoy/common/pure.h" #include "envoy/common/time.h" #include "envoy/http/codes.h" -#include "envoy/thread_local/thread_local.h" +#include "envoy/thread_local/thread_local_object.h" namespace Envoy { namespace Extensions { diff --git a/source/server/BUILD b/source/server/BUILD index 5e4ee63d9fae..c3404818a217 100644 --- a/source/server/BUILD +++ b/source/server/BUILD @@ -254,7 +254,7 @@ envoy_cc_library( srcs = ["overload_manager_impl.cc"], hdrs = ["overload_manager_impl.h"], deps = [ - "//include/envoy/server:overload_manager_interface", + "//include/envoy/server/overload:overload_manager_interface", "//include/envoy/stats:stats_interface", "//include/envoy/thread_local:thread_local_interface", "//source/common/common:logger_lib", diff --git a/source/server/admin/admin.h b/source/server/admin/admin.h index feddd8855c4b..de79c60b1992 100644 --- a/source/server/admin/admin.h +++ b/source/server/admin/admin.h @@ -14,7 +14,7 @@ #include "envoy/server/admin.h" #include "envoy/server/instance.h" #include "envoy/server/listener_manager.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "envoy/upstream/outlier_detection.h" #include "envoy/upstream/resource_manager.h" diff --git a/source/server/overload_manager_impl.cc b/source/server/overload_manager_impl.cc index db5ced97e41d..f399bb96ecfe 100644 --- a/source/server/overload_manager_impl.cc +++ b/source/server/overload_manager_impl.cc @@ -5,7 +5,6 @@ #include "envoy/common/exception.h" #include "envoy/config/overload/v3/overload.pb.h" #include "envoy/config/overload/v3/overload.pb.validate.h" -#include "envoy/server/overload_manager.h" #include "envoy/stats/scope.h" #include "common/common/fmt.h" diff --git a/source/server/overload_manager_impl.h b/source/server/overload_manager_impl.h index 55f0ee7517b0..b86162fb0224 100644 --- a/source/server/overload_manager_impl.h +++ b/source/server/overload_manager_impl.h @@ -8,7 +8,7 @@ #include "envoy/event/dispatcher.h" #include "envoy/event/scaled_range_timer_manager.h" #include "envoy/protobuf/message_validator.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "envoy/server/resource_monitor.h" #include "envoy/stats/scope.h" #include "envoy/stats/stats.h" diff --git a/test/mocks/server/BUILD b/test/mocks/server/BUILD index d38b00d01c0c..7214ca820371 100644 --- a/test/mocks/server/BUILD +++ b/test/mocks/server/BUILD @@ -161,7 +161,7 @@ envoy_cc_mock( srcs = ["overload_manager.cc"], hdrs = ["overload_manager.h"], deps = [ - "//include/envoy/server:overload_manager_interface", + "//include/envoy/server/overload:overload_manager_interface", "//test/mocks/event:event_mocks", ], ) @@ -207,7 +207,7 @@ envoy_cc_mock( hdrs = ["main.h"], deps = [ "//include/envoy/server:configuration_interface", - "//include/envoy/server:overload_manager_interface", + "//include/envoy/server/overload:overload_manager_interface", ], ) diff --git a/test/mocks/server/main.h b/test/mocks/server/main.h index 59f6259250d7..17e00013c27d 100644 --- a/test/mocks/server/main.h +++ b/test/mocks/server/main.h @@ -6,7 +6,7 @@ #include #include "envoy/server/configuration.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "gmock/gmock.h" diff --git a/test/mocks/server/overload_manager.h b/test/mocks/server/overload_manager.h index 1dc9f4dc4b23..03fe54aa3232 100644 --- a/test/mocks/server/overload_manager.h +++ b/test/mocks/server/overload_manager.h @@ -2,7 +2,8 @@ #include -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" +#include "envoy/server/overload/thread_local_overload_state.h" #include "gmock/gmock.h" diff --git a/test/server/overload_manager_impl_test.cc b/test/server/overload_manager_impl_test.cc index e2e9ffb80f65..a134cfab6075 100644 --- a/test/server/overload_manager_impl_test.cc +++ b/test/server/overload_manager_impl_test.cc @@ -1,7 +1,7 @@ #include #include "envoy/config/overload/v3/overload.pb.h" -#include "envoy/server/overload_manager.h" +#include "envoy/server/overload/overload_manager.h" #include "envoy/server/resource_monitor.h" #include "envoy/server/resource_monitor_config.h" From 366c5dc0205be8c47a779e3a17c024552f412d00 Mon Sep 17 00:00:00 2001 From: Alex Konradi Date: Thu, 12 Nov 2020 11:52:22 -0500 Subject: [PATCH 2/2] Fix formatting Signed-off-by: Alex Konradi --- include/envoy/thread_local/thread_local_object.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/envoy/thread_local/thread_local_object.h b/include/envoy/thread_local/thread_local_object.h index 0944c8c5299a..e305102f7118 100644 --- a/include/envoy/thread_local/thread_local_object.h +++ b/include/envoy/thread_local/thread_local_object.h @@ -10,8 +10,8 @@ namespace Envoy { namespace ThreadLocal { /** -* All objects that are stored via the ThreadLocal interface must derive from this type. -*/ + * All objects that are stored via the ThreadLocal interface must derive from this type. + */ class ThreadLocalObject { public: virtual ~ThreadLocalObject() = default;