grpc 1.50.0-x86_64-linux → 1.51.0-x86_64-linux

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

@@ -36,13 +36,17 @@
 #include "src/core/ext/filters/client_channel/lb_policy/outlier_detection/outlier_detection.h"
 #include "src/core/ext/xds/xds_bootstrap.h"
 #include "src/core/ext/xds/xds_bootstrap_grpc.h"
+#include "src/core/ext/xds/xds_client.h"
 #include "src/core/ext/xds/xds_common_types.h"
 #include "src/core/ext/xds/xds_resource_type.h"
 #include "src/core/ext/xds/xds_resource_type_impl.h"
+#include "src/core/lib/json/json.h"
 
 namespace grpc_core {
 
-struct XdsClusterResource {
+bool XdsCustomLbPolicyEnabled();
+
+struct XdsClusterResource : public XdsResourceType::ResourceData {
   enum ClusterType { EDS, LOGICAL_DNS, AGGREGATE };
   ClusterType cluster_type;
   // For cluster type EDS.
@@ -63,11 +67,9 @@ struct XdsClusterResource {
   // If not set, load reporting will be disabled.
   absl::optional<GrpcXdsBootstrap::GrpcXdsServer> lrs_load_reporting_server;
 
-  // The LB policy to use (e.g., "ROUND_ROBIN" or "RING_HASH").
-  std::string lb_policy;
-  // Used for RING_HASH LB policy only.
-  uint64_t min_ring_size = 1024;
-  uint64_t max_ring_size = 8388608;
+  // The LB policy to use for locality and endpoint picking.
+  Json::Array lb_policy_config;
+
   // Maximum number of outstanding requests can be made to the upstream
   // cluster.
   uint32_t max_concurrent_requests = 1024;
@@ -81,9 +83,7 @@ struct XdsClusterResource {
            prioritized_cluster_names == other.prioritized_cluster_names &&
            common_tls_context == other.common_tls_context &&
            lrs_load_reporting_server == other.lrs_load_reporting_server &&
-           lb_policy == other.lb_policy &&
-           min_ring_size == other.min_ring_size &&
-           max_ring_size == other.max_ring_size &&
+           lb_policy_config == other.lb_policy_config &&
            max_concurrent_requests == other.max_concurrent_requests &&
            outlier_detection == other.outlier_detection;
   }
@@ -97,17 +97,13 @@ class XdsClusterResourceType
   absl::string_view type_url() const override {
     return "envoy.config.cluster.v3.Cluster";
   }
-  absl::string_view v2_type_url() const override {
-    return "envoy.api.v2.Cluster";
-  }
 
   DecodeResult Decode(const XdsResourceType::DecodeContext& context,
-                      absl::string_view serialized_resource,
-                      bool is_v2) const override;
+                      absl::string_view serialized_resource) const override;
 
   bool AllResourcesRequiredInSotW() const override { return true; }
 
-  void InitUpbSymtab(upb_DefPool* symtab) const override {
+  void InitUpbSymtab(XdsClient*, upb_DefPool* symtab) const override {
     envoy_config_cluster_v3_Cluster_getmsgdef(symtab);
     envoy_extensions_clusters_aggregate_v3_ClusterConfig_getmsgdef(symtab);
     envoy_extensions_transport_sockets_tls_v3_UpstreamTlsContext_getmsgdef(

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

@@ -24,9 +24,9 @@
 #include <map>
 #include <utility>
 
-#include "absl/memory/memory.h"
 #include "absl/status/status.h"
 #include "absl/strings/str_cat.h"
+#include "absl/types/variant.h"
 #include "upb/json_encode.h"
 #include "upb/status.h"
 #include "upb/upb.hpp"
@@ -34,6 +34,7 @@
 #include <grpc/support/log.h>
 
 #include "src/core/lib/config/core_configuration.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/json/json.h"
 #include "src/core/lib/load_balancing/lb_policy_registry.h"
 #include "src/proto/grpc/lookup/v1/rls_config.upb.h"
@@ -41,6 +42,10 @@
 
 namespace grpc_core {
 
+//
+// XdsRouteLookupClusterSpecifierPlugin
+//
+
 const char* kXdsRouteLookupClusterSpecifierPluginConfigName =
     "grpc.lookup.v1.RouteLookupClusterSpecifier";
 
@@ -51,10 +56,15 @@ void XdsRouteLookupClusterSpecifierPlugin::PopulateSymtab(
 
 absl::StatusOr<std::string>
 XdsRouteLookupClusterSpecifierPlugin::GenerateLoadBalancingPolicyConfig(
-    upb_StringView serialized_plugin_config, upb_Arena* arena,
-    upb_DefPool* symtab) const {
+    XdsExtension extension, upb_Arena* arena, upb_DefPool* symtab) const {
+  absl::string_view* serialized_plugin_config =
+      absl::get_if<absl::string_view>(&extension.value);
+  if (serialized_plugin_config == nullptr) {
+    return absl::InvalidArgumentError("could not parse plugin config");
+  }
   const auto* specifier = grpc_lookup_v1_RouteLookupClusterSpecifier_parse(
-      serialized_plugin_config.data, serialized_plugin_config.size, arena);
+      serialized_plugin_config->data(), serialized_plugin_config->size(),
+      arena);
   if (specifier == nullptr) {
     return absl::InvalidArgumentError("Could not parse plugin config");
   }
@@ -109,41 +119,34 @@ XdsRouteLookupClusterSpecifierPlugin::GenerateLoadBalancingPolicyConfig(
   return lb_policy_config.Dump();
 }
 
-namespace {
-
-using PluginRegistryMap =
-    std::map<absl::string_view, std::unique_ptr<XdsClusterSpecifierPluginImpl>>;
+//
+// XdsClusterSpecifierPluginRegistry
+//
 
-PluginRegistryMap* g_plugin_registry = nullptr;
+XdsClusterSpecifierPluginRegistry::XdsClusterSpecifierPluginRegistry() {
+  RegisterPlugin(std::make_unique<XdsRouteLookupClusterSpecifierPlugin>(),
+                 kXdsRouteLookupClusterSpecifierPluginConfigName);
+}
 
-}  // namespace
+void XdsClusterSpecifierPluginRegistry::RegisterPlugin(
+    std::unique_ptr<XdsClusterSpecifierPluginImpl> plugin,
+    absl::string_view config_proto_type_name) {
+  registry_[config_proto_type_name] = std::move(plugin);
+}
 
 const XdsClusterSpecifierPluginImpl*
 XdsClusterSpecifierPluginRegistry::GetPluginForType(
-    absl::string_view config_proto_type_name) {
-  auto it = g_plugin_registry->find(config_proto_type_name);
-  if (it == g_plugin_registry->end()) return nullptr;
+    absl::string_view config_proto_type_name) const {
+  auto it = registry_.find(config_proto_type_name);
+  if (it == registry_.end()) return nullptr;
   return it->second.get();
 }
 
-void XdsClusterSpecifierPluginRegistry::PopulateSymtab(upb_DefPool* symtab) {
-  for (const auto& p : *g_plugin_registry) {
+void XdsClusterSpecifierPluginRegistry::PopulateSymtab(
+    upb_DefPool* symtab) const {
+  for (const auto& p : registry_) {
     p.second->PopulateSymtab(symtab);
   }
 }
 
-void XdsClusterSpecifierPluginRegistry::RegisterPlugin(
-    std::unique_ptr<XdsClusterSpecifierPluginImpl> plugin,
-    absl::string_view config_proto_type_name) {
-  (*g_plugin_registry)[config_proto_type_name] = std::move(plugin);
-}
-
-void XdsClusterSpecifierPluginRegistry::Init() {
-  g_plugin_registry = new PluginRegistryMap;
-  RegisterPlugin(absl::make_unique<XdsRouteLookupClusterSpecifierPlugin>(),
-                 kXdsRouteLookupClusterSpecifierPluginConfigName);
-}
-
-void XdsClusterSpecifierPluginRegistry::Shutdown() { delete g_plugin_registry; }
-
 }  // namespace grpc_core

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

@@ -19,14 +19,17 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <map>
 #include <memory>
 #include <string>
+#include <utility>
 
 #include "absl/status/statusor.h"
 #include "absl/strings/string_view.h"
 #include "upb/arena.h"
 #include "upb/def.h"
-#include "upb/upb.h"
+
+#include "src/core/ext/xds/xds_common_types.h"
 
 namespace grpc_core {
 
@@ -39,8 +42,7 @@ class XdsClusterSpecifierPluginImpl {
 
   // Returns the LB policy config in JSON form.
   virtual absl::StatusOr<std::string> GenerateLoadBalancingPolicyConfig(
-      upb_StringView serialized_plugin_config, upb_Arena* arena,
-      upb_DefPool* symtab) const = 0;
+      XdsExtension extension, upb_Arena* arena, upb_DefPool* symtab) const = 0;
 };
 
 class XdsRouteLookupClusterSpecifierPlugin
@@ -48,24 +50,41 @@ class XdsRouteLookupClusterSpecifierPlugin
   void PopulateSymtab(upb_DefPool* symtab) const override;
 
   absl::StatusOr<std::string> GenerateLoadBalancingPolicyConfig(
-      upb_StringView serialized_plugin_config, upb_Arena* arena,
+      XdsExtension extension, upb_Arena* arena,
       upb_DefPool* symtab) const override;
 };
 
 class XdsClusterSpecifierPluginRegistry {
  public:
-  static void RegisterPlugin(
-      std::unique_ptr<XdsClusterSpecifierPluginImpl> plugin,
-      absl::string_view config_proto_type_name);
-
-  static void PopulateSymtab(upb_DefPool* symtab);
-
-  static const XdsClusterSpecifierPluginImpl* GetPluginForType(
-      absl::string_view config_proto_type_name);
-
-  // Global init and shutdown.
-  static void Init();
-  static void Shutdown();
+  XdsClusterSpecifierPluginRegistry();
+
+  // Not copyable.
+  XdsClusterSpecifierPluginRegistry(const XdsClusterSpecifierPluginRegistry&) =
+      delete;
+  XdsClusterSpecifierPluginRegistry& operator=(
+      const XdsClusterSpecifierPluginRegistry&) = delete;
+
+  // Movable.
+  XdsClusterSpecifierPluginRegistry(
+      XdsClusterSpecifierPluginRegistry&& other) noexcept
+      : registry_(std::move(other.registry_)) {}
+  XdsClusterSpecifierPluginRegistry& operator=(
+      XdsClusterSpecifierPluginRegistry&& other) noexcept {
+    registry_ = std::move(other.registry_);
+    return *this;
+  }
+
+  void RegisterPlugin(std::unique_ptr<XdsClusterSpecifierPluginImpl> plugin,
+                      absl::string_view config_proto_type_name);
+
+  void PopulateSymtab(upb_DefPool* symtab) const;
+
+  const XdsClusterSpecifierPluginImpl* GetPluginForType(
+      absl::string_view config_proto_type_name) const;
+
+ private:
+  std::map<absl::string_view, std::unique_ptr<XdsClusterSpecifierPluginImpl>>
+      registry_;
 };
 
 }  // namespace grpc_core