Skip to content

Change HdsCluster::cluster_ to a value instead of reference #12137

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
snowp merged 1 commit into from
Jul 20, 2020
Merged

Change HdsCluster::cluster_ to a value instead of reference #12137

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
14 changes: 7 additions & 7 deletions source/common/upstream/health_discovery_service.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@ void HdsDelegate::processMessage(
ENVOY_LOG(debug, "New HdsCluster config {} ", cluster_config.DebugString());

// Create HdsCluster
hds_clusters_.emplace_back(new HdsCluster(admin_, runtime_, cluster_config, bind_config,
store_stats_, ssl_context_manager_, false,
info_factory_, cm_, local_info_, dispatcher_, random_,
singleton_manager_, tls_, validation_visitor_, api_));
hds_clusters_.emplace_back(
new HdsCluster(admin_, runtime_, std::move(cluster_config), bind_config, store_stats_,
ssl_context_manager_, false, info_factory_, cm_, local_info_, dispatcher_,
random_, singleton_manager_, tls_, validation_visitor_, api_));
hds_clusters_.back()->initialize([] {});

hds_clusters_.back()->startHealthchecks(access_log_manager_, runtime_, random_, dispatcher_,
Expand Down Expand Up @@ -233,15 +233,15 @@ void HdsDelegate::onRemoteClose(Grpc::Status::GrpcStatus status, const std::stri
}

HdsCluster::HdsCluster(Server::Admin& admin, Runtime::Loader& runtime,
const envoy::config::cluster::v3::Cluster& cluster,
envoy::config::cluster::v3::Cluster cluster,
const envoy::config::core::v3::BindConfig& bind_config, Stats::Store& stats,
Ssl::ContextManager& ssl_context_manager, bool added_via_api,
ClusterInfoFactory& info_factory, ClusterManager& cm,
const LocalInfo::LocalInfo& local_info, Event::Dispatcher& dispatcher,
Random::RandomGenerator& random, Singleton::Manager& singleton_manager,
ThreadLocal::SlotAllocator& tls,
ProtobufMessage::ValidationVisitor& validation_visitor, Api::Api& api)
: runtime_(runtime), cluster_(cluster), bind_config_(bind_config), stats_(stats),
: runtime_(runtime), cluster_(std::move(cluster)), bind_config_(bind_config), stats_(stats),
ssl_context_manager_(ssl_context_manager), added_via_api_(added_via_api),
initial_hosts_(new HostVector()), validation_visitor_(validation_visitor) {
ENVOY_LOG(debug, "Creating an HdsCluster");
Expand All @@ -251,7 +251,7 @@ HdsCluster::HdsCluster(Server::Admin& admin, Runtime::Loader& runtime,
{admin, runtime_, cluster_, bind_config_, stats_, ssl_context_manager_, added_via_api_, cm,
local_info, dispatcher, random, singleton_manager, tls, validation_visitor, api});

for (const auto& host : cluster.load_assignment().endpoints(0).lb_endpoints()) {
for (const auto& host : cluster_.load_assignment().endpoints(0).lb_endpoints()) {
initial_hosts_->emplace_back(
new HostImpl(info_, "", Network::Address::resolveProtoAddress(host.endpoint().address()),
nullptr, 1, envoy::config::core::v3::Locality().default_instance(),
Expand Down
4 changes: 2 additions & 2 deletions source/common/upstream/health_discovery_service.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class HdsCluster : public Cluster, Logger::Loggable<Logger::Id::upstream> {
public:
static ClusterSharedPtr create();
HdsCluster(Server::Admin& admin, Runtime::Loader& runtime,
const envoy::config::cluster::v3::Cluster& cluster,
envoy::config::cluster::v3::Cluster cluster,
const envoy::config::core::v3::BindConfig& bind_config, Stats::Store& stats,
Ssl::ContextManager& ssl_context_manager, bool added_via_api,
ClusterInfoFactory& info_factory, ClusterManager& cm,
Expand Down Expand Up @@ -78,7 +78,7 @@ class HdsCluster : public Cluster, Logger::Loggable<Logger::Id::upstream> {
std::function<void()> initialization_complete_callback_;

Runtime::Loader& runtime_;
const envoy::config::cluster::v3::Cluster& cluster_;
const envoy::config::cluster::v3::Cluster cluster_;
const envoy::config::core::v3::BindConfig& bind_config_;
Stats::Store& stats_;
Ssl::ContextManager& ssl_context_manager_;
Expand Down