Skip to content

eds: pass ClusterLoadAssignment by value to enable move semantics #43700

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

Open
wdauchy wants to merge 3 commits into
base: main
Choose a base branch
from
Open

eds: pass ClusterLoadAssignment by value to enable move semantics #43700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eaf8cf5
eds: pass ClusterLoadAssignment by value to enable move semantics
wdauchy Mar 1, 2026
22c81cb
address comments
wdauchy Mar 3, 2026
d6a723c
Merge remote-tracking branch 'upstream/main' into wdauchy/eds-leds-av…
wdauchy Mar 5, 2026
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
12 changes: 5 additions & 7 deletions source/extensions/clusters/eds/eds.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ EdsClusterImpl::onConfigUpdate(const std::vector<Config::DecodedResourceRef>& re
Config::ScopedResume resume_leds =
transport_factory_context_->serverFactoryContext().xdsManager().pause(type_url);

update(cluster_load_assignment);
update(std::move(cluster_load_assignment));
// If previously used a cached version, remove the subscription from the cache's
// callbacks.
if (using_cached_resource_) {
Expand All @@ -265,7 +265,7 @@ EdsClusterImpl::onConfigUpdate(const std::vector<Config::DecodedResourceRef>& re
}

void EdsClusterImpl::update(
const envoy::config::endpoint::v3::ClusterLoadAssignment& cluster_load_assignment) {
envoy::config::endpoint::v3::ClusterLoadAssignment&& cluster_load_assignment) {
// Drop overload configuration parsing.
THROW_IF_NOT_OK(parseDropOverloadConfig(cluster_load_assignment));

Expand All @@ -287,8 +287,6 @@ void EdsClusterImpl::update(
return cla_leds_configs.find(leds_config) == cla_leds_configs.end();
});

// In case LEDS is used, store the cluster load assignment as a field
// (optimize for no-copy).
const envoy::config::endpoint::v3::ClusterLoadAssignment* used_load_assignment;
if (!cla_leds_configs.empty() || eds_resources_cache_.has_value()) {
cluster_load_assignment_ = std::make_unique<envoy::config::endpoint::v3::ClusterLoadAssignment>(
Expand Down Expand Up @@ -343,7 +341,7 @@ void EdsClusterImpl::onAssignmentTimeout() {
// TODO(snowp): This should probably just use xDS TTLs?
envoy::config::endpoint::v3::ClusterLoadAssignment resource;
resource.set_cluster_name(edsServiceName());
update(resource);
update(std::move(resource));

if (eds_resources_cache_.has_value()) {
// Clear the resource so it won't be used, and its watchers will be notified.
Expand All @@ -362,7 +360,7 @@ void EdsClusterImpl::onCachedResourceRemoved(absl::string_view resource_name) {
}
envoy::config::endpoint::v3::ClusterLoadAssignment resource;
resource.set_cluster_name(edsServiceName());
update(resource);
update(std::move(resource));
}

void EdsClusterImpl::reloadHealthyHostsHelper(const HostSharedPtr& host) {
Expand Down Expand Up @@ -468,7 +466,7 @@ void EdsClusterImpl::onConfigUpdateFailed(Envoy::Config::ConfigUpdateFailureReas
dynamic_cast<const envoy::config::endpoint::v3::ClusterLoadAssignment&>(*cached_resource);
info_->configUpdateStats().assignment_use_cached_.inc();
using_cached_resource_ = true;
update(cached_load_assignment);
update(std::move(cached_load_assignment));
return;
}
}
Expand Down
2 changes: 1 addition & 1 deletion source/extensions/clusters/eds/eds.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class EdsClusterImpl
}

// Updates the internal data structures with a given cluster load assignment.
void update(const envoy::config::endpoint::v3::ClusterLoadAssignment& cluster_load_assignment);
void update(envoy::config::endpoint::v3::ClusterLoadAssignment&& cluster_load_assignment);

// EdsResourceRemovalCallback
void onCachedResourceRemoved(absl::string_view resource_name) override;
Expand Down
Loading