grpc 1.62.0 → 1.64.0.pre1

data/src/core/load_balancing/weighted_target/weighted_target.cc

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
+#include "src/core/load_balancing/weighted_target/weighted_target.h"
 
 #include <string.h>
 
@@ -27,6 +27,7 @@
 #include <vector>
 
 #include "absl/base/thread_annotations.h"
+#include "absl/log/check.h"
 #include "absl/meta/type_traits.h"
 #include "absl/random/random.h"
 #include "absl/status/status.h"
@@ -39,9 +40,8 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/load_balancing/address_filtering.h"
-#include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
@@ -58,6 +58,8 @@
 #include "src/core/lib/json/json_args.h"
 #include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/transport/connectivity_state.h"
+#include "src/core/load_balancing/address_filtering.h"
+#include "src/core/load_balancing/child_policy_handler.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
@@ -81,7 +83,7 @@ constexpr absl::string_view kWeightedTarget = "weighted_target_experimental";
 constexpr Duration kChildRetentionInterval = Duration::Minutes(15);
 
 // Config for weighted_target LB policy.
-class WeightedTargetLbConfig : public LoadBalancingPolicy::Config {
+class WeightedTargetLbConfig final : public LoadBalancingPolicy::Config {
  public:
   struct ChildConfig {
     uint32_t weight;
@@ -113,7 +115,7 @@ class WeightedTargetLbConfig : public LoadBalancingPolicy::Config {
 };
 
 // weighted_target LB policy.
-class WeightedTargetLb : public LoadBalancingPolicy {
+class WeightedTargetLb final : public LoadBalancingPolicy {
  public:
   explicit WeightedTargetLb(Args args);
 
@@ -125,7 +127,7 @@ class WeightedTargetLb : public LoadBalancingPolicy {
  private:
   // Picks a child using stateless WRR and then delegates to that
   // child's picker.
-  class WeightedPicker : public SubchannelPicker {
+  class WeightedPicker final : public SubchannelPicker {
    public:
     // Maintains a weighted list of pickers from each child that is in
     // ready state. The first element in the pair represents the end of a
@@ -149,7 +151,7 @@ class WeightedTargetLb : public LoadBalancingPolicy {
   };
 
   // Each WeightedChild holds a ref to its parent WeightedTargetLb.
-  class WeightedChild : public InternallyRefCounted<WeightedChild> {
+  class WeightedChild final : public InternallyRefCounted<WeightedChild> {
    public:
     WeightedChild(RefCountedPtr<WeightedTargetLb> weighted_target_policy,
                   const std::string& name);
@@ -160,7 +162,7 @@ class WeightedTargetLb : public LoadBalancingPolicy {
     absl::Status UpdateLocked(
         const WeightedTargetLbConfig::ChildConfig& config,
         absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses,
-        const std::string& resolution_note, const ChannelArgs& args);
+        const std::string& resolution_note, ChannelArgs args);
     void ResetBackoffLocked();
     void DeactivateLocked();
 
@@ -171,7 +173,7 @@ class WeightedTargetLb : public LoadBalancingPolicy {
     RefCountedPtr<SubchannelPicker> picker() const { return picker_; }
 
    private:
-    class Helper : public DelegatingChannelControlHelper {
+    class Helper final : public DelegatingChannelControlHelper {
      public:
       explicit Helper(RefCountedPtr<WeightedChild> weighted_child)
           : weighted_child_(std::move(weighted_child)) {}
@@ -191,7 +193,7 @@ class WeightedTargetLb : public LoadBalancingPolicy {
       RefCountedPtr<WeightedChild> weighted_child_;
     };
 
-    class DelayedRemovalTimer
+    class DelayedRemovalTimer final
         : public InternallyRefCounted<DelayedRemovalTimer> {
      public:
       explicit DelayedRemovalTimer(RefCountedPtr<WeightedChild> weighted_child);
@@ -273,7 +275,7 @@ WeightedTargetLb::PickResult WeightedTargetLb::WeightedPicker::Pick(
     }
   }
   if (index == 0) index = start_index;
-  GPR_ASSERT(pickers_[index].first > key);
+  CHECK(pickers_[index].first > key);
   // Delegate to the child picker.
   return pickers_[index].second->Pick(args);
 }
@@ -419,7 +421,7 @@ void WeightedTargetLb::UpdateStateLocked() {
     }
     switch (child->connectivity_state()) {
       case GRPC_CHANNEL_READY: {
-        GPR_ASSERT(child->weight() > 0);
+        CHECK_GT(child->weight(), 0u);
         ready_end += child->weight();
         ready_picker_list.emplace_back(ready_end, std::move(child_picker));
         break;
@@ -433,7 +435,7 @@ void WeightedTargetLb::UpdateStateLocked() {
         break;
       }
       case GRPC_CHANNEL_TRANSIENT_FAILURE: {
-        GPR_ASSERT(child->weight() > 0);
+        CHECK_GT(child->weight(), 0u);
         tf_end += child->weight();
         tf_picker_list.emplace_back(tf_end, std::move(child_picker));
         break;
@@ -512,7 +514,7 @@ void WeightedTargetLb::WeightedChild::DelayedRemovalTimer::Orphan() {
 }
 
 void WeightedTargetLb::WeightedChild::DelayedRemovalTimer::OnTimerLocked() {
-  GPR_ASSERT(timer_handle_.has_value());
+  CHECK(timer_handle_.has_value());
   timer_handle_.reset();
   weighted_child_->weighted_target_policy_->targets_.erase(
       weighted_child_->name_);
@@ -592,7 +594,7 @@ WeightedTargetLb::WeightedChild::CreateChildPolicyLocked(
 absl::Status WeightedTargetLb::WeightedChild::UpdateLocked(
     const WeightedTargetLbConfig::ChildConfig& config,
     absl::StatusOr<std::shared_ptr<EndpointAddressesIterator>> addresses,
-    const std::string& resolution_note, const ChannelArgs& args) {
+    const std::string& resolution_note, ChannelArgs args) {
   if (weighted_target_policy_->shutting_down_) return absl::OkStatus();
   // Update child weight.
   if (weight_ != config.weight &&
@@ -611,6 +613,7 @@ absl::Status WeightedTargetLb::WeightedChild::UpdateLocked(
     delayed_removal_timer_.reset();
   }
   // Create child policy if needed.
+  args = args.Set(GRPC_ARG_LB_WEIGHTED_TARGET_CHILD, name_);
   if (child_policy_ == nullptr) {
     child_policy_ = CreateChildPolicyLocked(args);
   }
@@ -619,7 +622,7 @@ absl::Status WeightedTargetLb::WeightedChild::UpdateLocked(
   update_args.config = config.config;
   update_args.addresses = std::move(addresses);
   update_args.resolution_note = resolution_note;
-  update_args.args = args;
+  update_args.args = std::move(args);
   // Update the policy.
   if (GRPC_TRACE_FLAG_ENABLED(grpc_lb_weighted_target_trace)) {
     gpr_log(GPR_INFO,
@@ -729,7 +732,7 @@ const JsonLoaderInterface* WeightedTargetLbConfig::JsonLoader(const JsonArgs&) {
   return loader;
 }
 
-class WeightedTargetLbFactory : public LoadBalancingPolicyFactory {
+class WeightedTargetLbFactory final : public LoadBalancingPolicyFactory {
  public:
   OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
       LoadBalancingPolicy::Args args) const override {

data/src/core/load_balancing/weighted_target/weighted_target.h

@@ -0,0 +1,28 @@
+//
+// Copyright 2024 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+#ifndef GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_TARGET_WEIGHTED_TARGET_H
+#define GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_TARGET_WEIGHTED_TARGET_H
+
+#include <grpc/support/port_platform.h>
+
+#include "src/core/resolver/endpoint_addresses.h"
+
+// Channel arg key indicating the weighted_target child name.
+#define GRPC_ARG_LB_WEIGHTED_TARGET_CHILD \
+  GRPC_ARG_NO_SUBCHANNEL_PREFIX "lb_weighted_target_child"
+
+#endif  // GRPC_SRC_CORE_LOAD_BALANCING_WEIGHTED_TARGET_WEIGHTED_TARGET_H

data/src/core/load_balancing/xds/cds.cc

@@ -14,8 +14,6 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <algorithm>
 #include <map>
 #include <memory>
@@ -25,6 +23,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -36,13 +35,8 @@
 #include <grpc/impl/connectivity_state.h>
 #include <grpc/support/json.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/load_balancing/address_filtering.h"
-#include "src/core/load_balancing/outlier_detection/outlier_detection.h"
-#include "src/core/load_balancing/xds/xds_channel_args.h"
-#include "src/core/ext/xds/xds_cluster.h"
-#include "src/core/ext/xds/xds_common_types.h"
-#include "src/core/ext/xds/xds_health_status.h"
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/debug/trace.h"
@@ -59,11 +53,17 @@
 #include "src/core/lib/json/json_args.h"
 #include "src/core/lib/json/json_object_loader.h"
 #include "src/core/lib/json/json_writer.h"
+#include "src/core/load_balancing/address_filtering.h"
 #include "src/core/load_balancing/delegating_helper.h"
 #include "src/core/load_balancing/lb_policy.h"
 #include "src/core/load_balancing/lb_policy_factory.h"
 #include "src/core/load_balancing/lb_policy_registry.h"
+#include "src/core/load_balancing/outlier_detection/outlier_detection.h"
+#include "src/core/load_balancing/xds/xds_channel_args.h"
 #include "src/core/resolver/xds/xds_dependency_manager.h"
+#include "src/core/xds/grpc/xds_cluster.h"
+#include "src/core/xds/grpc/xds_common_types.h"
+#include "src/core/xds/grpc/xds_health_status.h"
 
 namespace grpc_core {
 
@@ -85,7 +85,7 @@ using XdsConfig = XdsDependencyManager::XdsConfig;
 constexpr absl::string_view kCds = "cds_experimental";
 
 // Config for this LB policy.
-class CdsLbConfig : public LoadBalancingPolicy::Config {
+class CdsLbConfig final : public LoadBalancingPolicy::Config {
  public:
   CdsLbConfig() = default;
 
@@ -115,7 +115,7 @@ class CdsLbConfig : public LoadBalancingPolicy::Config {
 };
 
 // CDS LB policy.
-class CdsLb : public LoadBalancingPolicy {
+class CdsLb final : public LoadBalancingPolicy {
  public:
   explicit CdsLb(Args args);
 
@@ -232,7 +232,7 @@ std::string MakeChildPolicyName(absl::string_view cluster,
                       "}");
 }
 
-class PriorityEndpointIterator : public EndpointAddressesIterator {
+class PriorityEndpointIterator final : public EndpointAddressesIterator {
  public:
   PriorityEndpointIterator(
       std::string cluster_name,
@@ -254,7 +254,7 @@ class PriorityEndpointIterator : public EndpointAddressesIterator {
         const auto& locality = p.second;
         std::vector<RefCountedStringValue> hierarchical_path = {
             RefCountedStringValue(priority_child_name),
-            RefCountedStringValue(locality_name->AsHumanReadableString())};
+            locality_name->human_readable_string()};
         auto hierarchical_path_attr =
             MakeRefCounted<HierarchicalPathArg>(std::move(hierarchical_path));
         for (const auto& endpoint : locality.endpoints) {
@@ -286,13 +286,13 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
     gpr_log(GPR_INFO, "[cdslb %p] received update: cluster=%s is_dynamic=%d",
             this, new_config->cluster().c_str(), new_config->is_dynamic());
   }
-  GPR_ASSERT(new_config != nullptr);
+  CHECK(new_config != nullptr);
   // Cluster name should never change, because we should use a different
   // child name in xds_cluster_manager in that case.
   if (cluster_name_.empty()) {
     cluster_name_ = new_config->cluster();
   } else {
-    GPR_ASSERT(cluster_name_ == new_config->cluster());
+    CHECK(cluster_name_ == new_config->cluster());
   }
   // Start dynamic subscription if needed.
   if (new_config->is_dynamic() && subscription_ == nullptr) {
@@ -348,7 +348,7 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
     ReportTransientFailure(new_cluster_config.status());
     return new_cluster_config.status();
   }
-  GPR_ASSERT(new_cluster_config->cluster != nullptr);
+  CHECK_NE(new_cluster_config->cluster, nullptr);
   // Find old cluster, if any.
   const XdsConfig::ClusterConfig* old_cluster_config = nullptr;
   if (xds_config_ != nullptr) {
@@ -388,7 +388,7 @@ absl::Status CdsLb::UpdateLocked(UpdateArgs args) {
           ReportTransientFailure(aggregate_cluster_config.status());
           return aggregate_cluster_config.status();
         }
-        GPR_ASSERT(aggregate_cluster_config->cluster != nullptr);
+        CHECK_NE(aggregate_cluster_config->cluster, nullptr);
         aggregate_cluster_resource = aggregate_cluster_config->cluster.get();
       }
     } else {
@@ -470,9 +470,8 @@ CdsLb::ChildNameState CdsLb::ComputeChildNames(
     const XdsConfig::ClusterConfig* old_cluster,
     const XdsConfig::ClusterConfig& new_cluster,
     const XdsConfig::ClusterConfig::EndpointConfig& endpoint_config) const {
-  GPR_ASSERT(
-      !absl::holds_alternative<XdsConfig::ClusterConfig::AggregateConfig>(
-          new_cluster.children));
+  CHECK(!absl::holds_alternative<XdsConfig::ClusterConfig::AggregateConfig>(
+      new_cluster.children));
   // First, build some maps from locality to child number and the reverse
   // from old_cluster and child_name_state_.
   std::map<XdsLocalityName*, size_t /*child_number*/, XdsLocalityName::Less>
@@ -731,7 +730,7 @@ void CdsLb::ReportTransientFailure(absl::Status status) {
 // factory
 //
 
-class CdsLbFactory : public LoadBalancingPolicyFactory {
+class CdsLbFactory final : public LoadBalancingPolicyFactory {
  public:
   OrphanablePtr<LoadBalancingPolicy> CreateLoadBalancingPolicy(
       LoadBalancingPolicy::Args args) const override {