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

upstream: avoid double hashing of protos in CDS init #15241

Merged
merged 1 commit into from
Mar 2, 2021
Merged

upstream: avoid double hashing of protos in CDS init #15241

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
24 changes: 13 additions & 11 deletions source/common/upstream/cluster_manager_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ ClusterManagerImpl::ClusterManagerImpl(
// Load all the primary clusters.
for (const auto& cluster : bootstrap.static_resources().clusters()) {
if (is_primary_cluster(cluster)) {
loadCluster(cluster, "", false, active_clusters_);
loadCluster(cluster, MessageUtil::hash(cluster), "", false, active_clusters_);
}
}

Expand Down Expand Up @@ -365,7 +365,7 @@ ClusterManagerImpl::ClusterManagerImpl(
if (cluster.type() == envoy::config::cluster::v3::Cluster::EDS &&
cluster.eds_cluster_config().eds_config().config_source_specifier_case() !=
envoy::config::core::v3::ConfigSource::ConfigSourceSpecifierCase::kPath) {
loadCluster(cluster, "", false, active_clusters_);
loadCluster(cluster, MessageUtil::hash(cluster), "", false, active_clusters_);
}
}

Expand Down Expand Up @@ -650,7 +650,8 @@ bool ClusterManagerImpl::addOrUpdateCluster(const envoy::config::cluster::v3::Cl
init_helper_.state() == ClusterManagerInitHelper::State::AllClustersInitialized;
// Preserve the previous cluster data to avoid early destroy. The same cluster should be added
// before destroy to avoid early initialization complete.
const auto previous_cluster = loadCluster(cluster, version_info, true, warming_clusters_);
const auto previous_cluster =
loadCluster(cluster, new_hash, version_info, true, warming_clusters_);
auto& cluster_entry = warming_clusters_.at(cluster_name);
if (!all_clusters_initialized) {
ENVOY_LOG(debug, "add/update cluster {} during init", cluster_name);
Expand Down Expand Up @@ -720,8 +721,8 @@ bool ClusterManagerImpl::removeCluster(const std::string& cluster_name) {

ClusterManagerImpl::ClusterDataPtr
ClusterManagerImpl::loadCluster(const envoy::config::cluster::v3::Cluster& cluster,
const std::string& version_info, bool added_via_api,
ClusterMap& cluster_map) {
const uint64_t cluster_hash, const std::string& version_info,
bool added_via_api, ClusterMap& cluster_map) {
std::pair<ClusterSharedPtr, ThreadAwareLoadBalancerPtr> new_cluster_pair =
factory_.clusterFromProto(cluster, *this, outlier_event_logger_, added_via_api);
auto& new_cluster = new_cluster_pair.first;
Expand Down Expand Up @@ -770,14 +771,15 @@ ClusterManagerImpl::loadCluster(const envoy::config::cluster::v3::Cluster& clust
auto cluster_entry_it = cluster_map.find(cluster_reference.info()->name());
if (cluster_entry_it != cluster_map.end()) {
result = std::exchange(cluster_entry_it->second,
std::make_unique<ClusterData>(cluster, version_info, added_via_api,
std::move(new_cluster), time_source_));
std::make_unique<ClusterData>(cluster, cluster_hash, version_info,
added_via_api, std::move(new_cluster),
time_source_));
} else {
bool inserted = false;
std::tie(cluster_entry_it, inserted) =
cluster_map.emplace(cluster_reference.info()->name(),
std::make_unique<ClusterData>(cluster, version_info, added_via_api,
std::move(new_cluster), time_source_));
std::tie(cluster_entry_it, inserted) = cluster_map.emplace(
cluster_reference.info()->name(),
std::make_unique<ClusterData>(cluster, cluster_hash, version_info, added_via_api,
std::move(new_cluster), time_source_));
ASSERT(inserted);
}
// If an LB is thread aware, create it here. The LB is not initialized until cluster pre-init
Expand Down
10 changes: 5 additions & 5 deletions source/common/upstream/cluster_manager_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,9 +468,9 @@ class ClusterManagerImpl : public ClusterManager, Logger::Loggable<Logger::Id::u

struct ClusterData : public ClusterManagerCluster {
ClusterData(const envoy::config::cluster::v3::Cluster& cluster_config,
const std::string& version_info, bool added_via_api, ClusterSharedPtr&& cluster,
TimeSource& time_source)
: cluster_config_(cluster_config), config_hash_(MessageUtil::hash(cluster_config)),
const uint64_t cluster_config_hash, const std::string& version_info,
bool added_via_api, ClusterSharedPtr&& cluster, TimeSource& time_source)
: cluster_config_(cluster_config), config_hash_(cluster_config_hash),
version_info_(version_info), added_via_api_(added_via_api), cluster_(std::move(cluster)),
last_updated_(time_source.systemTime()) {}

Expand Down Expand Up @@ -563,8 +563,8 @@ class ClusterManagerImpl : public ClusterManager, Logger::Loggable<Logger::Id::u
* nullptr if cluster_map did not contain the same cluster.
*/
ClusterDataPtr loadCluster(const envoy::config::cluster::v3::Cluster& cluster,
const std::string& version_info, bool added_via_api,
ClusterMap& cluster_map);
const uint64_t cluster_hash, const std::string& version_info,
bool added_via_api, ClusterMap& cluster_map);
void onClusterInit(ClusterManagerCluster& cluster);
void postThreadLocalHealthFailure(const HostSharedPtr& host);
void updateClusterCounts();
Expand Down