natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cds LB] obtain dynamic subscription even if cluster is present in XdsConfig (#35627) 

This ensures that if a cluster is used both in the RouteConfig and via a ClusterSpecifierPlugin, and then the entry in the RouteConfig goes away, we won't unsubscribe and then resubscribe to the CDS resource.

Closes #35627

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/35627 from markdroth:xds_rls_dynamic_subscription_fix c78afaf6ce
PiperOrigin-RevId: 600801766
This commit is contained in:
Mark D. Roth 2024-01-23 08:45:17 -08:00 committed by Copybara-Service
parent 562bc9b363
commit 2c25cd7bcf
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
View File

@ -294,6 +294,23 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
} else { } else {
GPR_ASSERT(cluster_name_ == new_config->cluster()); GPR_ASSERT(cluster_name_ == new_config->cluster());
} }
// Start dynamic subscription if needed.
if (new_config->is_dynamic() && subscription_ == nullptr) {
if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) {
gpr_log(GPR_INFO,
"[cdslb %p] obtaining dynamic subscription for cluster %s", this,
cluster_name_.c_str());
}
auto* dependency_mgr = args.args.GetObject<XdsDependencyManager>();
if (dependency_mgr == nullptr) {
// Should never happen.
absl::Status status =
absl::InternalError("xDS dependency mgr not passed to CDS LB policy");
ReportTransientFailure(status);
return status;
}
subscription_ = dependency_mgr->GetClusterSubscription(cluster_name_);
}
// Get xDS config. // Get xDS config.
auto new_xds_config = args.args.GetObjectRef<XdsConfig>(); auto new_xds_config = args.args.GetObjectRef<XdsConfig>();
if (new_xds_config == nullptr) { if (new_xds_config == nullptr) {
@ -307,27 +324,13 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
if (it == new_xds_config->clusters.end()) { if (it == new_xds_config->clusters.end()) {
// Cluster not present. // Cluster not present.
if (new_config->is_dynamic()) { if (new_config->is_dynamic()) {
// This is a dynamic cluster. Subscribe to it if not yet subscribed.
if (subscription_ == nullptr) {
auto* dependency_mgr = args.args.GetObject<XdsDependencyManager>();
if (dependency_mgr == nullptr) {
// Should never happen.
absl::Status status = absl::InternalError(
"xDS dependency mgr not passed to CDS LB policy");
ReportTransientFailure(status);
return status;
}
subscription_ = dependency_mgr->GetClusterSubscription(cluster_name_);
// Stay in CONNECTING until we get an update that has the cluster.
return absl::OkStatus();
}
// If we are already subscribed, it's possible that we just // If we are already subscribed, it's possible that we just
// recently subscribed but another update came through before we // recently subscribed but another update came through before we
// got the new cluster, in which case it will still be missing. // got the new cluster, in which case it will still be missing.
if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) { if (GRPC_TRACE_FLAG_ENABLED(grpc_cds_lb_trace)) {
gpr_log(GPR_INFO, gpr_log(GPR_INFO,
"[cdslb %p] xDS config has no entry for dynamic cluster %s, " "[cdslb %p] xDS config has no entry for dynamic cluster %s, "
"ignoring update", "waiting for subsequent update",
this, cluster_name_.c_str()); this, cluster_name_.c_str());
} }
// Stay in CONNECTING until we get an update that has the cluster. // Stay in CONNECTING until we get an update that has the cluster.