grpc 1.52.2 → 1.53.0.pre2

data/src/core/ext/xds/xds_client.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_CLIENT_H
-#define GRPC_CORE_EXT_XDS_XDS_CLIENT_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -341,4 +341,4 @@ class XdsClient : public DualRefCounted<XdsClient> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_CLIENT_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H

data/src/core/ext/xds/xds_client_grpc.cc

@@ -225,7 +225,6 @@ void SetXdsFallbackBootstrapConfig(const char* config) {
 grpc_slice grpc_dump_xds_configs(void) {
   grpc_core::ApplicationCallbackExecCtx callback_exec_ctx;
   grpc_core::ExecCtx exec_ctx;
-  grpc_error_handle error;
   auto xds_client = grpc_core::GrpcXdsClient::GetOrCreate(
       grpc_core::ChannelArgs(), "grpc_dump_xds_configs()");
   if (!xds_client.ok()) {

data/src/core/ext/xds/xds_client_grpc.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
-#define GRPC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
 
 #include <grpc/support/port_platform.h>
 
@@ -76,4 +76,4 @@ void SetXdsFallbackBootstrapConfig(const char* config);
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_GRPC_H

data/src/core/ext/xds/xds_client_stats.h

@@ -16,13 +16,14 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
-#define GRPC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
 
 #include <grpc/support/port_platform.h>
 
 #include <atomic>
 #include <cstdint>
+#include <initializer_list>
 #include <map>
 #include <string>
 #include <utility>
@@ -239,4 +240,4 @@ class XdsClusterLocalityStats : public RefCounted<XdsClusterLocalityStats> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H

data/src/core/ext/xds/xds_cluster.cc

@@ -77,8 +77,8 @@ bool XdsCustomLbPolicyEnabled() {
 }
 
 // TODO(eostroukhov): Remove once this feature is no longer experimental.
-bool XdsHostOverrideEnabled() {
-  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_ENABLE_HOST_OVERRIDE");
+bool XdsOverrideHostEnabled() {
+  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_ENABLE_OVERRIDE_HOST");
   if (!value.has_value()) return false;
   bool parsed_value;
   bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
@@ -122,10 +122,10 @@ std::string XdsClusterResource::ToString() const {
   }
   contents.push_back(
       absl::StrCat("max_concurrent_requests=", max_concurrent_requests));
-  if (!host_override_statuses.empty()) {
+  if (!override_host_statuses.empty()) {
     std::vector<const char*> statuses;
-    statuses.reserve(host_override_statuses.size());
-    for (const auto& status : host_override_statuses) {
+    statuses.reserve(override_host_statuses.size());
+    for (const auto& status : override_host_statuses) {
       statuses.push_back(status.ToString());
     }
     contents.push_back(absl::StrCat("override_host_statuses={",
@@ -306,6 +306,10 @@ XdsClusterResource::Aggregate AggregateClusterParse(
   const upb_StringView* clusters =
       envoy_extensions_clusters_aggregate_v3_ClusterConfig_clusters(
           aggregate_cluster_config, &size);
+  if (size == 0) {
+    ValidationErrors::ScopedField field(errors, ".clusters");
+    errors->AddError("must be non-empty");
+  }
   for (size_t i = 0; i < size; ++i) {
     aggregate.prioritized_cluster_names.emplace_back(
         UpbStringToStdString(clusters[i]));
@@ -628,7 +632,7 @@ absl::StatusOr<XdsClusterResource> CdsResourceParse(
     cds_update.outlier_detection = outlier_detection_update;
   }
   // Validate override host status.
-  if (XdsHostOverrideEnabled()) {
+  if (XdsOverrideHostEnabled()) {
     const auto* common_lb_config =
         envoy_config_cluster_v3_Cluster_common_lb_config(cluster);
     if (common_lb_config != nullptr) {
@@ -644,7 +648,7 @@ absl::StatusOr<XdsClusterResource> CdsResourceParse(
         for (size_t i = 0; i < size; ++i) {
           auto status = XdsHealthStatus::FromUpb(statuses[i]);
           if (status.has_value()) {
-            cds_update.host_override_statuses.insert(*status);
+            cds_update.override_host_statuses.insert(*status);
           }
         }
       }

data/src/core/ext/xds/xds_cluster.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_CLUSTER_H
-#define GRPC_CORE_EXT_XDS_XDS_CLUSTER_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -48,7 +48,7 @@
 namespace grpc_core {
 
 bool XdsCustomLbPolicyEnabled();
-bool XdsHostOverrideEnabled();
+bool XdsOverrideHostEnabled();
 
 struct XdsClusterResource : public XdsResourceType::ResourceData {
   struct Eds {
@@ -98,7 +98,7 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
 
   absl::optional<OutlierDetectionConfig> outlier_detection;
 
-  std::set<XdsHealthStatus> host_override_statuses;
+  std::set<XdsHealthStatus> override_host_statuses;
 
   bool operator==(const XdsClusterResource& other) const {
     return type == other.type && lb_policy_config == other.lb_policy_config &&
@@ -106,7 +106,7 @@ struct XdsClusterResource : public XdsResourceType::ResourceData {
            common_tls_context == other.common_tls_context &&
            max_concurrent_requests == other.max_concurrent_requests &&
            outlier_detection == other.outlier_detection &&
-           host_override_statuses == other.host_override_statuses;
+           override_host_statuses == other.override_host_statuses;
   }
 
   std::string ToString() const;
@@ -134,4 +134,4 @@ class XdsClusterResourceType
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_CLUSTER_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_H

data/src/core/ext/xds/xds_cluster_specifier_plugin.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
-#define GRPC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
 
 #include <grpc/support/port_platform.h>
 
@@ -94,4 +94,4 @@ class XdsClusterSpecifierPluginRegistry {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLUSTER_SPECIFIER_PLUGIN_H

data/src/core/ext/xds/xds_common_types.cc

@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include <algorithm>
+#include <initializer_list>
 #include <map>
 #include <utility>
 

data/src/core/ext/xds/xds_common_types.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
-#define GRPC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
 
 #include <grpc/support/port_platform.h>
 
@@ -105,4 +105,4 @@ absl::optional<XdsExtension> ExtractXdsExtension(
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_COMMON_TYPES_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_COMMON_TYPES_H

data/src/core/ext/xds/xds_endpoint.cc

@@ -154,7 +154,7 @@ absl::optional<ServerAddress> ServerAddressParse(
   // health_status
   const int32_t health_status =
       envoy_config_endpoint_v3_LbEndpoint_health_status(lb_endpoint);
-  if (!XdsHostOverrideEnabled() &&
+  if (!XdsOverrideHostEnabled() &&
       health_status != envoy_config_core_v3_UNKNOWN &&
       health_status != envoy_config_core_v3_HEALTHY) {
     return absl::nullopt;

data/src/core/ext/xds/xds_endpoint.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_ENDPOINT_H
-#define GRPC_CORE_EXT_XDS_XDS_ENDPOINT_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H
 
 #include <grpc/support/port_platform.h>
 
@@ -136,4 +136,4 @@ class XdsEndpointResourceType
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_ENDPOINT_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_ENDPOINT_H

data/src/core/ext/xds/xds_health_status.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
-#define GRPC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -26,6 +26,7 @@
 
 #include "absl/strings/string_view.h"
 #include "absl/types/optional.h"
+#include "absl/types/span.h"
 
 #include "src/core/lib/resolver/server_address.h"
 
@@ -53,6 +54,32 @@ class XdsHealthStatus {
   HealthStatus status_;
 };
 
+class XdsHealthStatusSet {
+ public:
+  XdsHealthStatusSet() = default;
+
+  explicit XdsHealthStatusSet(absl::Span<const XdsHealthStatus> statuses) {
+    for (XdsHealthStatus status : statuses) {
+      Add(status);
+    }
+  }
+
+  bool operator==(const XdsHealthStatusSet& other) const {
+    return status_mask_ == other.status_mask_;
+  }
+
+  void Clear() { status_mask_ = 0; }
+
+  void Add(XdsHealthStatus status) { status_mask_ |= (0x1 << status.status()); }
+
+  bool Contains(XdsHealthStatus status) const {
+    return status_mask_ & (0x1 << status.status());
+  }
+
+ private:
+  int status_mask_ = 0;
+};
+
 bool operator<(const XdsHealthStatus& hs1, const XdsHealthStatus& hs2);
 
 class XdsEndpointHealthStatusAttribute
@@ -79,4 +106,4 @@ class XdsEndpointHealthStatusAttribute
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HEALTH_STATUS_H

data/src/core/ext/xds/xds_http_fault_filter.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
-#define GRPC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -55,4 +55,4 @@ class XdsHttpFaultFilter : public XdsHttpFilterImpl {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FAULT_FILTER_H

data/src/core/ext/xds/xds_http_filters.cc

@@ -88,7 +88,7 @@ XdsHttpFilterRegistry::XdsHttpFilterRegistry(bool register_builtins) {
     RegisterFilter(std::make_unique<XdsHttpRouterFilter>());
     RegisterFilter(std::make_unique<XdsHttpFaultFilter>());
     RegisterFilter(std::make_unique<XdsHttpRbacFilter>());
-    if (XdsHostOverrideEnabled()) {
+    if (XdsOverrideHostEnabled()) {
       RegisterFilter(std::make_unique<XdsHttpStatefulSessionFilter>());
     }
   }

data/src/core/ext/xds/xds_http_filters.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
-#define GRPC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -178,4 +178,4 @@ class XdsHttpFilterRegistry {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_FILTERS_H

data/src/core/ext/xds/xds_http_rbac_filter.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
-#define GRPC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -55,4 +55,4 @@ class XdsHttpRbacFilter : public XdsHttpFilterImpl {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_RBAC_FILTER_H

data/src/core/ext/xds/xds_http_stateful_session_filter.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
-#define GRPC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -55,4 +55,4 @@ class XdsHttpStatefulSessionFilter : public XdsHttpFilterImpl {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_HTTP_STATEFUL_SESSION_FILTER_H

data/src/core/ext/xds/xds_lb_policy_registry.cc

@@ -28,12 +28,16 @@
 #include "absl/types/optional.h"
 #include "absl/types/variant.h"
 #include "envoy/config/core/v3/extension.upb.h"
+#include "envoy/extensions/load_balancing_policies/client_side_weighted_round_robin/v3/client_side_weighted_round_robin.upb.h"
 #include "envoy/extensions/load_balancing_policies/ring_hash/v3/ring_hash.upb.h"
 #include "envoy/extensions/load_balancing_policies/wrr_locality/v3/wrr_locality.upb.h"
 #include "google/protobuf/wrappers.upb.h"
 
 #include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/env.h"
+#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/validation_errors.h"
 #include "src/core/lib/load_balancing/lb_policy_registry.h"
 
@@ -59,6 +63,79 @@ class RoundRobinLbPolicyConfigFactory
   }
 };
 
+class ClientSideWeightedRoundRobinLbPolicyConfigFactory
+    : public XdsLbPolicyRegistry::ConfigFactory {
+ public:
+  Json::Object ConvertXdsLbPolicyConfig(
+      const XdsLbPolicyRegistry* /*registry*/,
+      const XdsResourceType::DecodeContext& context,
+      absl::string_view configuration, ValidationErrors* errors,
+      int /*recursion_depth*/) override {
+    const auto* resource =
+        envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_parse(
+            configuration.data(), configuration.size(), context.arena);
+    if (resource == nullptr) {
+      errors->AddError(
+          "can't decode ClientSideWeightedRoundRobin LB policy config");
+      return {};
+    }
+    Json::Object config;
+    // enable_oob_load_report
+    auto* enable_oob_load_report =
+        envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_enable_oob_load_report(
+            resource);
+    if (enable_oob_load_report != nullptr &&
+        google_protobuf_BoolValue_value(enable_oob_load_report)) {
+      config["enableOobLoadReport"] = true;
+    }
+    // oob_reporting_period
+    auto* duration_proto =
+        envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_oob_reporting_period(
+            resource);
+    if (duration_proto != nullptr) {
+      ValidationErrors::ScopedField field(errors, ".oob_reporting_period");
+      Duration duration = ParseDuration(duration_proto, errors);
+      config["oobReportingPeriod"] = duration.ToJsonString();
+    }
+    // blackout_period
+    duration_proto =
+        envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_blackout_period(
+            resource);
+    if (duration_proto != nullptr) {
+      ValidationErrors::ScopedField field(errors, ".blackout_period");
+      Duration duration = ParseDuration(duration_proto, errors);
+      config["blackoutPeriod"] = duration.ToJsonString();
+    }
+    // weight_update_period
+    duration_proto =
+        envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_update_period(
+            resource);
+    if (duration_proto != nullptr) {
+      ValidationErrors::ScopedField field(errors, ".weight_update_period");
+      Duration duration = ParseDuration(duration_proto, errors);
+      config["weightUpdatePeriod"] = duration.ToJsonString();
+    }
+    // weight_expiration_period
+    duration_proto =
+        envoy_extensions_load_balancing_policies_client_side_weighted_round_robin_v3_ClientSideWeightedRoundRobin_weight_expiration_period(
+            resource);
+    if (duration_proto != nullptr) {
+      ValidationErrors::ScopedField field(errors, ".weight_expiration_period");
+      Duration duration = ParseDuration(duration_proto, errors);
+      config["weightExpirationPeriod"] = duration.ToJsonString();
+    }
+    return Json::Object{
+        {"weighted_round_robin_experimental", std::move(config)}};
+  }
+
+  absl::string_view type() override { return Type(); }
+
+  static absl::string_view Type() {
+    return "envoy.extensions.load_balancing_policies.client_side_weighted_"
+           "round_robin.v3.ClientSideWeightedRoundRobin";
+  }
+};
+
 class RingHashLbPolicyConfigFactory
     : public XdsLbPolicyRegistry::ConfigFactory {
  public:
@@ -168,6 +245,19 @@ class WrrLocalityLbPolicyConfigFactory
 // XdsLbPolicyRegistry
 //
 
+namespace {
+
+// TODO(roth): Remove this when interop tests pass.
+bool XdsWrrLbEnabled() {
+  auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_WRR_LB");
+  if (!value.has_value()) return false;
+  bool parsed_value;
+  bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
+  return parse_succeeded && parsed_value;
+}
+
+}  // namespace
+
 XdsLbPolicyRegistry::XdsLbPolicyRegistry() {
   policy_config_factories_.emplace(
       RingHashLbPolicyConfigFactory::Type(),
@@ -175,6 +265,11 @@ XdsLbPolicyRegistry::XdsLbPolicyRegistry() {
   policy_config_factories_.emplace(
       RoundRobinLbPolicyConfigFactory::Type(),
       std::make_unique<RoundRobinLbPolicyConfigFactory>());
+  if (XdsWrrLbEnabled()) {
+    policy_config_factories_.emplace(
+        ClientSideWeightedRoundRobinLbPolicyConfigFactory::Type(),
+        std::make_unique<ClientSideWeightedRoundRobinLbPolicyConfigFactory>());
+  }
   policy_config_factories_.emplace(
       WrrLocalityLbPolicyConfigFactory::Type(),
       std::make_unique<WrrLocalityLbPolicyConfigFactory>());

data/src/core/ext/xds/xds_lb_policy_registry.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
-#define GRPC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -68,4 +68,4 @@ class XdsLbPolicyRegistry {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_LB_POLICY_REGISTRY_H

data/src/core/ext/xds/xds_listener.cc

@@ -20,6 +20,7 @@
 
 #include <stdint.h>
 
+#include <initializer_list>
 #include <set>
 #include <utility>
 

data/src/core/ext/xds/xds_listener.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_LISTENER_H
-#define GRPC_CORE_EXT_XDS_XDS_LISTENER_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -223,4 +223,4 @@ class XdsListenerResourceType
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_LISTENER_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_LISTENER_H

data/src/core/ext/xds/xds_resource_type.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
-#define GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
 #include <grpc/support/port_platform.h>
 
 #include <memory>
@@ -101,4 +101,4 @@ class XdsResourceType {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H

data/src/core/ext/xds/xds_resource_type_impl.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
-#define GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
 #include <grpc/support/port_platform.h>
 
 #include <memory>
@@ -85,4 +85,4 @@ class XdsResourceTypeImpl : public XdsResourceType {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H

data/src/core/ext/xds/xds_route_config.cc

@@ -21,6 +21,8 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <initializer_list>
+#include <limits>
 #include <map>
 #include <memory>
 #include <set>
@@ -835,6 +837,7 @@ absl::optional<XdsRouteConfigResource::Route::RouteAction> RouteActionParse(
     GPR_ASSERT(weighted_clusters_proto != nullptr);
     std::vector<XdsRouteConfigResource::Route::RouteAction::ClusterWeight>
         action_weighted_clusters;
+    uint64_t total_weight = 0;
     size_t clusters_size;
     const envoy_config_route_v3_WeightedCluster_ClusterWeight* const* clusters =
         envoy_config_route_v3_WeightedCluster_clusters(weighted_clusters_proto,
@@ -874,12 +877,15 @@ absl::optional<XdsRouteConfigResource::Route::RouteAction> RouteActionParse(
       } else {
         cluster.weight = google_protobuf_UInt32Value_value(weight_proto);
         if (cluster.weight == 0) continue;
+        total_weight += cluster.weight;
       }
       // Add entry to WeightedClusters.
       action_weighted_clusters.emplace_back(std::move(cluster));
     }
     if (action_weighted_clusters.empty()) {
       errors->AddError("no valid clusters specified");
+    } else if (total_weight > std::numeric_limits<uint32_t>::max()) {
+      errors->AddError("sum of cluster weights exceeds uint32 max");
     }
     route_action.action = std::move(action_weighted_clusters);
   } else if (XdsRlsEnabled() &&

data/src/core/ext/xds/xds_route_config.h

@@ -14,8 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
-#define GRPC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
 
 #include <grpc/support/port_platform.h>
 
@@ -249,4 +249,4 @@ class XdsRouteConfigResourceType
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_ROUTE_CONFIG_H

data/src/core/ext/xds/xds_routing.h

@@ -16,8 +16,8 @@
 //
 //
 
-#ifndef GRPC_CORE_EXT_XDS_XDS_ROUTING_H
-#define GRPC_CORE_EXT_XDS_XDS_ROUTING_H
+#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
+#define GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H
 
 #include <grpc/support/port_platform.h>
 
@@ -103,4 +103,4 @@ class XdsRouting {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_CORE_EXT_XDS_XDS_ROUTING_H
+#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_ROUTING_H