grpc 1.65.2 → 1.66.0.pre3

data/src/core/load_balancing/priority/priority.cc

@@ -26,6 +26,7 @@
 #include <vector>
 
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -36,7 +37,6 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/impl/channel_arg_names.h>
 #include <grpc/impl/connectivity_state.h>
-#include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>
 
 #include "src/core/lib/channel/channel_args.h"
@@ -295,19 +295,19 @@ PriorityLb::PriorityLb(Args args)
               .GetDurationFromIntMillis(GRPC_ARG_PRIORITY_FAILOVER_TIMEOUT_MS)
               .value_or(kDefaultChildFailoverTimeout))) {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO, "[priority_lb %p] created", this);
+    LOG(INFO) << "[priority_lb " << this << "] created";
   }
 }
 
 PriorityLb::~PriorityLb() {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO, "[priority_lb %p] destroying priority LB policy", this);
+    LOG(INFO) << "[priority_lb " << this << "] destroying priority LB policy";
   }
 }
 
 void PriorityLb::ShutdownLocked() {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO, "[priority_lb %p] shutting down", this);
+    LOG(INFO) << "[priority_lb " << this << "] shutting down";
   }
   shutting_down_ = true;
   children_.clear();
@@ -317,9 +317,9 @@ void PriorityLb::ExitIdleLocked() {
   if (current_priority_ != UINT32_MAX) {
     const std::string& child_name = config_->priorities()[current_priority_];
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO,
-              "[priority_lb %p] exiting IDLE for current priority %d child %s",
-              this, current_priority_, child_name.c_str());
+      LOG(INFO) << "[priority_lb " << this
+                << "] exiting IDLE for current priority " << current_priority_
+                << " child " << child_name;
     }
     children_[child_name]->ExitIdleLocked();
   }
@@ -331,7 +331,7 @@ void PriorityLb::ResetBackoffLocked() {
 
 absl::Status PriorityLb::UpdateLocked(UpdateArgs args) {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO, "[priority_lb %p] received update", this);
+    LOG(INFO) << "[priority_lb " << this << "] received update";
   }
   // Update config.
   config_ = args.config.TakeAsSubclass<PriorityLbConfig>();
@@ -403,8 +403,8 @@ void PriorityLb::ChoosePriorityLocked() {
     // If the child for the priority does not exist yet, create it.
     const std::string& child_name = config_->priorities()[priority];
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO, "[priority_lb %p] trying priority %u, child %s", this,
-              priority, child_name.c_str());
+      LOG(INFO) << "[priority_lb " << this << "] trying priority " << priority
+                << ", child " << child_name;
     }
     auto& child = children_[child_name];
     // Create child if needed.
@@ -444,28 +444,26 @@ void PriorityLb::ChoosePriorityLocked() {
     }
     // Child has been failing for a while.  Move on to the next priority.
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO,
-              "[priority_lb %p] skipping priority %u, child %s: state=%s, "
-              "failover timer not pending",
-              this, priority, child_name.c_str(),
-              ConnectivityStateName(child->connectivity_state()));
+      LOG(INFO) << "[priority_lb " << this << "] skipping priority " << priority
+                << ", child " << child_name << ": state="
+                << ConnectivityStateName(child->connectivity_state())
+                << ", failover timer not pending";
     }
   }
   // If we didn't find any priority to try, pick the first one in state
   // CONNECTING.
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO,
-            "[priority_lb %p] no priority reachable, checking for CONNECTING "
-            "priority to delegate to",
-            this);
+    LOG(INFO) << "[priority_lb " << this
+              << "] no priority reachable, checking for CONNECTING priority to "
+                 "delegate to";
   }
   for (uint32_t priority = 0; priority < config_->priorities().size();
        ++priority) {
     // If the child for the priority does not exist yet, create it.
     const std::string& child_name = config_->priorities()[priority];
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO, "[priority_lb %p] trying priority %u, child %s", this,
-              priority, child_name.c_str());
+      LOG(INFO) << "[priority_lb " << this << "] trying priority " << priority
+                << ", child " << child_name;
     }
     auto& child = children_[child_name];
     CHECK(child != nullptr);
@@ -485,11 +483,10 @@ void PriorityLb::SetCurrentPriorityLocked(int32_t priority,
                                           bool deactivate_lower_priorities,
                                           const char* reason) {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO,
-            "[priority_lb %p] selecting priority %u, child %s (%s, "
-            "deactivate_lower_priorities=%d)",
-            this, priority, config_->priorities()[priority].c_str(), reason,
-            deactivate_lower_priorities);
+    LOG(INFO) << "[priority_lb " << this << "] selecting priority " << priority
+              << ", child " << config_->priorities()[priority] << " (" << reason
+              << ", deactivate_lower_priorities=" << deactivate_lower_priorities
+              << ")";
   }
   current_priority_ = priority;
   if (deactivate_lower_priorities) {
@@ -514,12 +511,10 @@ PriorityLb::ChildPriority::DeactivationTimer::DeactivationTimer(
     RefCountedPtr<PriorityLb::ChildPriority> child_priority)
     : child_priority_(std::move(child_priority)) {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO,
-            "[priority_lb %p] child %s (%p): deactivating -- will remove in "
-            "%" PRId64 "ms",
-            child_priority_->priority_policy_.get(),
-            child_priority_->name_.c_str(), child_priority_.get(),
-            kChildRetentionInterval.millis());
+    LOG(INFO) << "[priority_lb " << child_priority_->priority_policy_.get()
+              << "] child " << child_priority_->name_ << " ("
+              << child_priority_.get() << "): deactivating -- will remove in "
+              << kChildRetentionInterval.millis() << "ms";
   }
   timer_handle_ =
       child_priority_->priority_policy_->channel_control_helper()
@@ -538,9 +533,9 @@ PriorityLb::ChildPriority::DeactivationTimer::DeactivationTimer(
 void PriorityLb::ChildPriority::DeactivationTimer::Orphan() {
   if (timer_handle_.has_value()) {
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO, "[priority_lb %p] child %s (%p): reactivating",
-              child_priority_->priority_policy_.get(),
-              child_priority_->name_.c_str(), child_priority_.get());
+      LOG(INFO) << "[priority_lb " << child_priority_->priority_policy_.get()
+                << "] child " << child_priority_->name_ << " ("
+                << child_priority_.get() << "): reactivating";
     }
     child_priority_->priority_policy_->channel_control_helper()
         ->GetEventEngine()
@@ -554,11 +549,10 @@ void PriorityLb::ChildPriority::DeactivationTimer::OnTimerLocked() {
   if (timer_handle_.has_value()) {
     timer_handle_.reset();
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO,
-              "[priority_lb %p] child %s (%p): deactivation timer fired, "
-              "deleting child",
-              child_priority_->priority_policy_.get(),
-              child_priority_->name_.c_str(), child_priority_.get());
+      LOG(INFO) << "[priority_lb " << child_priority_->priority_policy_.get()
+                << "] child " << child_priority_->name_ << " ("
+                << child_priority_.get()
+                << "): deactivation timer fired, deleting child";
     }
     child_priority_->priority_policy_->DeleteChild(child_priority_.get());
   }
@@ -572,13 +566,12 @@ PriorityLb::ChildPriority::FailoverTimer::FailoverTimer(
     RefCountedPtr<PriorityLb::ChildPriority> child_priority)
     : child_priority_(std::move(child_priority)) {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(
-        GPR_INFO,
-        "[priority_lb %p] child %s (%p): starting failover timer for %" PRId64
-        "ms",
-        child_priority_->priority_policy_.get(), child_priority_->name_.c_str(),
-        child_priority_.get(),
-        child_priority_->priority_policy_->child_failover_timeout_.millis());
+    LOG(INFO)
+        << "[priority_lb " << child_priority_->priority_policy_.get()
+        << "] child " << child_priority_->name_ << " (" << child_priority_.get()
+        << "): starting failover timer for "
+        << child_priority_->priority_policy_->child_failover_timeout_.millis()
+        << "ms";
   }
   timer_handle_ =
       child_priority_->priority_policy_->channel_control_helper()
@@ -598,10 +591,9 @@ PriorityLb::ChildPriority::FailoverTimer::FailoverTimer(
 void PriorityLb::ChildPriority::FailoverTimer::Orphan() {
   if (timer_handle_.has_value()) {
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO,
-              "[priority_lb %p] child %s (%p): cancelling failover timer",
-              child_priority_->priority_policy_.get(),
-              child_priority_->name_.c_str(), child_priority_.get());
+      LOG(INFO) << "[priority_lb " << child_priority_->priority_policy_.get()
+                << "] child " << child_priority_->name_ << " ("
+                << child_priority_.get() << "): cancelling failover timer";
     }
     child_priority_->priority_policy_->channel_control_helper()
         ->GetEventEngine()
@@ -615,11 +607,10 @@ void PriorityLb::ChildPriority::FailoverTimer::OnTimerLocked() {
   if (timer_handle_.has_value()) {
     timer_handle_.reset();
     if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-      gpr_log(GPR_INFO,
-              "[priority_lb %p] child %s (%p): failover timer fired, "
-              "reporting TRANSIENT_FAILURE",
-              child_priority_->priority_policy_.get(),
-              child_priority_->name_.c_str(), child_priority_.get());
+      LOG(INFO) << "[priority_lb " << child_priority_->priority_policy_.get()
+                << "] child " << child_priority_->name_ << " ("
+                << child_priority_.get()
+                << "): failover timer fired, reporting TRANSIENT_FAILURE";
     }
     child_priority_->OnConnectivityStateUpdateLocked(
         GRPC_CHANNEL_TRANSIENT_FAILURE,
@@ -636,8 +627,8 @@ PriorityLb::ChildPriority::ChildPriority(
     RefCountedPtr<PriorityLb> priority_policy, std::string name)
     : priority_policy_(std::move(priority_policy)), name_(std::move(name)) {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO, "[priority_lb %p] creating child %s (%p)",
-            priority_policy_.get(), name_.c_str(), this);
+    LOG(INFO) << "[priority_lb " << priority_policy_.get()
+              << "] creating child " << name_ << " (" << this << ")";
   }
   // Start the failover timer.
   failover_timer_ = MakeOrphanable<FailoverTimer>(Ref());
@@ -645,8 +636,8 @@ PriorityLb::ChildPriority::ChildPriority(
 
 void PriorityLb::ChildPriority::Orphan() {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO, "[priority_lb %p] child %s (%p): orphaned",
-            priority_policy_.get(), name_.c_str(), this);
+    LOG(INFO) << "[priority_lb " << priority_policy_.get() << "] child "
+              << name_ << " (" << this << "): orphaned";
   }
   failover_timer_.reset();
   deactivation_timer_.reset();
@@ -675,8 +666,8 @@ absl::Status PriorityLb::ChildPriority::UpdateLocked(
     bool ignore_reresolution_requests) {
   if (priority_policy_->shutting_down_) return absl::OkStatus();
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO, "[priority_lb %p] child %s (%p): start update",
-            priority_policy_.get(), name_.c_str(), this);
+    LOG(INFO) << "[priority_lb " << priority_policy_.get() << "] child "
+              << name_ << " (" << this << "): start update";
   }
   ignore_reresolution_requests_ = ignore_reresolution_requests;
   // Create policy if needed.
@@ -701,9 +692,9 @@ absl::Status PriorityLb::ChildPriority::UpdateLocked(
   update_args.args = priority_policy_->args_;
   // Update the policy.
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO,
-            "[priority_lb %p] child %s (%p): updating child policy handler %p",
-            priority_policy_.get(), name_.c_str(), this, child_policy_.get());
+    LOG(INFO) << "[priority_lb " << priority_policy_.get() << "] child "
+              << name_ << " (" << this << "): updating child policy handler "
+              << child_policy_.get();
   }
   return child_policy_->UpdateLocked(std::move(update_args));
 }
@@ -719,10 +710,9 @@ PriorityLb::ChildPriority::CreateChildPolicyLocked(const ChannelArgs& args) {
       MakeOrphanable<ChildPolicyHandler>(std::move(lb_policy_args),
                                          &priority_lb_trace);
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO,
-            "[priority_lb %p] child %s (%p): created new child policy "
-            "handler %p",
-            priority_policy_.get(), name_.c_str(), this, lb_policy.get());
+    LOG(INFO) << "[priority_lb " << priority_policy_.get() << "] child "
+              << name_ << " (" << this << "): created new child policy handler "
+              << lb_policy.get();
   }
   // Add the parent's interested_parties pollset_set to that of the newly
   // created child policy. This will make the child policy progress upon
@@ -744,11 +734,10 @@ void PriorityLb::ChildPriority::OnConnectivityStateUpdateLocked(
     grpc_connectivity_state state, const absl::Status& status,
     RefCountedPtr<SubchannelPicker> picker) {
   if (GRPC_TRACE_FLAG_ENABLED(priority_lb)) {
-    gpr_log(GPR_INFO,
-            "[priority_lb %p] child %s (%p): state update: %s (%s) picker %p",
-            priority_policy_.get(), name_.c_str(), this,
-            ConnectivityStateName(state), status.ToString().c_str(),
-            picker.get());
+    LOG(INFO) << "[priority_lb " << priority_policy_.get() << "] child "
+              << name_ << " (" << this
+              << "): state update: " << ConnectivityStateName(state) << " ("
+              << status << ") picker " << picker.get();
   }
   // Store the state and picker.
   connectivity_state_ = state;

data/src/core/load_balancing/ring_hash/ring_hash.cc

@@ -30,6 +30,7 @@
 #include "absl/base/attributes.h"
 #include "absl/container/inlined_vector.h"
 #include "absl/log/check.h"
+#include "absl/log/log.h"
 #include "absl/status/status.h"
 #include "absl/status/statusor.h"
 #include "absl/strings/str_cat.h"
@@ -39,7 +40,6 @@
 #include <grpc/impl/channel_arg_names.h>
 #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/client_channel/client_channel_internal.h"
@@ -300,8 +300,7 @@ class RingHash final : public LoadBalancingPolicy {
 
 RingHash::PickResult RingHash::Picker::Pick(PickArgs args) {
   auto* call_state = static_cast<ClientChannelLbCallState*>(args.call_state);
-  auto* hash_attribute = static_cast<RequestHashAttribute*>(
-      call_state->GetCallAttribute(RequestHashAttribute::TypeName()));
+  auto* hash_attribute = call_state->GetCallAttribute<RequestHashAttribute>();
   if (hash_attribute == nullptr) {
     return PickResult::Fail(absl::InternalError("hash attribute not present"));
   }
@@ -530,11 +529,10 @@ void RingHash::RingHashEndpoint::CreateChildPolicy() {
           "pick_first", std::move(lb_policy_args));
   if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
     const EndpointAddresses& endpoint = ring_hash_->endpoints_[index_];
-    gpr_log(GPR_INFO,
-            "[RH %p] endpoint %p (index %" PRIuPTR " of %" PRIuPTR
-            ", %s): created child policy %p",
-            ring_hash_.get(), this, index_, ring_hash_->endpoints_.size(),
-            endpoint.ToString().c_str(), child_policy_.get());
+    LOG(INFO) << "[RH " << ring_hash_.get() << "] endpoint " << this
+              << " (index " << index_ << " of " << ring_hash_->endpoints_.size()
+              << ", " << endpoint.ToString() << "): created child policy "
+              << child_policy_.get();
   }
   // Add our interested_parties pollset_set to that of the newly created
   // child policy. This will make the child policy progress upon activity on
@@ -573,14 +571,13 @@ void RingHash::RingHashEndpoint::OnStateUpdate(
     grpc_connectivity_state new_state, const absl::Status& status,
     RefCountedPtr<SubchannelPicker> picker) {
   if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-    gpr_log(
-        GPR_INFO,
-        "[RH %p] connectivity changed for endpoint %p (%s, child_policy=%p): "
-        "prev_state=%s new_state=%s (%s)",
-        ring_hash_.get(), this,
-        ring_hash_->endpoints_[index_].ToString().c_str(), child_policy_.get(),
-        ConnectivityStateName(connectivity_state_),
-        ConnectivityStateName(new_state), status.ToString().c_str());
+    LOG(INFO) << "[RH " << ring_hash_.get()
+              << "] connectivity changed for endpoint " << this << " ("
+              << ring_hash_->endpoints_[index_].ToString()
+              << ", child_policy=" << child_policy_.get()
+              << "): prev_state=" << ConnectivityStateName(connectivity_state_)
+              << " new_state=" << ConnectivityStateName(new_state) << " ("
+              << status << ")";
   }
   if (child_policy_ == nullptr) return;  // Already orphaned.
   // Update state.
@@ -601,19 +598,19 @@ void RingHash::RingHashEndpoint::OnStateUpdate(
 
 RingHash::RingHash(Args args) : LoadBalancingPolicy(std::move(args)) {
   if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-    gpr_log(GPR_INFO, "[RH %p] Created", this);
+    LOG(INFO) << "[RH " << this << "] Created";
   }
 }
 
 RingHash::~RingHash() {
   if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-    gpr_log(GPR_INFO, "[RH %p] Destroying Ring Hash policy", this);
+    LOG(INFO) << "[RH " << this << "] Destroying Ring Hash policy";
   }
 }
 
 void RingHash::ShutdownLocked() {
   if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-    gpr_log(GPR_INFO, "[RH %p] Shutting down", this);
+    LOG(INFO) << "[RH " << this << "] Shutting down";
   }
   shutdown_ = true;
   endpoint_map_.clear();
@@ -629,7 +626,7 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) {
   // Check address list.
   if (args.addresses.ok()) {
     if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-      gpr_log(GPR_INFO, "[RH %p] received update", this);
+      LOG(INFO) << "[RH " << this << "] received update";
     }
     // De-dup endpoints, taking weight into account.
     endpoints_.clear();
@@ -645,10 +642,9 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) {
         int prev_weight_arg =
             prev_endpoint.args().GetInt(GRPC_ARG_ADDRESS_WEIGHT).value_or(1);
         if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-          gpr_log(GPR_INFO,
-                  "[RH %p] merging duplicate endpoint for %s, combined "
-                  "weight %d",
-                  this, key.ToString().c_str(), weight_arg + prev_weight_arg);
+          LOG(INFO) << "[RH " << this << "] merging duplicate endpoint for "
+                    << key.ToString() << ", combined weight "
+                    << weight_arg + prev_weight_arg;
         }
         prev_endpoint = EndpointAddresses(
             prev_endpoint.addresses(),
@@ -660,8 +656,8 @@ absl::Status RingHash::UpdateLocked(UpdateArgs args) {
     });
   } else {
     if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-      gpr_log(GPR_INFO, "[RH %p] received update with addresses error: %s",
-              this, args.addresses.status().ToString().c_str());
+      LOG(INFO) << "[RH " << this << "] received update with addresses error: "
+                << args.addresses.status();
     }
     // If we already have an endpoint list, then keep using the existing
     // list, but still report back that the update was not accepted.
@@ -770,14 +766,13 @@ void RingHash::UpdateAggregatedConnectivityStateLocked(
     start_connection_attempt = true;
   }
   if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-    gpr_log(GPR_INFO,
-            "[RH %p] setting connectivity state to %s (num_idle=%" PRIuPTR
-            ", num_connecting=%" PRIuPTR ", num_ready=%" PRIuPTR
-            ", num_transient_failure=%" PRIuPTR ", size=%" PRIuPTR
-            ") -- start_connection_attempt=%d",
-            this, ConnectivityStateName(state), num_idle, num_connecting,
-            num_ready, num_transient_failure, endpoints_.size(),
-            start_connection_attempt);
+    LOG(INFO) << "[RH " << this << "] setting connectivity state to "
+              << ConnectivityStateName(state) << " (num_idle=" << num_idle
+              << ", num_connecting=" << num_connecting
+              << ", num_ready=" << num_ready
+              << ", num_transient_failure=" << num_transient_failure
+              << ", size=" << endpoints_.size()
+              << ") -- start_connection_attempt=" << start_connection_attempt;
   }
   // In TRANSIENT_FAILURE, report the last reported failure.
   // Otherwise, report OK.
@@ -848,12 +843,11 @@ void RingHash::UpdateAggregatedConnectivityStateLocked(
           EndpointAddressSet(endpoints_[first_idle_index].addresses()));
       CHECK(it != endpoint_map_.end());
       if (GRPC_TRACE_FLAG_ENABLED(ring_hash_lb)) {
-        gpr_log(GPR_INFO,
-                "[RH %p] triggering internal connection attempt for endpoint "
-                "%p (%s) (index %" PRIuPTR " of %" PRIuPTR ")",
-                this, it->second.get(),
-                endpoints_[first_idle_index].ToString().c_str(),
-                first_idle_index, endpoints_.size());
+        LOG(INFO) << "[RH " << this
+                  << "] triggering internal connection attempt for endpoint "
+                  << it->second.get() << " ("
+                  << endpoints_[first_idle_index].ToString() << ") (index "
+                  << first_idle_index << " of " << endpoints_.size() << ")";
       }
       it->second->RequestConnectionLocked();
     }