grpc 1.48.0 → 1.50.0

data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.cc

@@ -21,6 +21,7 @@
 #include <stddef.h>
 
 #include <memory>
+#include <utility>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gpr/useful.h"
@@ -72,9 +73,17 @@ grpc_arg CreateGrpclbBalancerAddressesArg(
 }
 
 const ServerAddressList* FindGrpclbBalancerAddressesInChannelArgs(
-    const grpc_channel_args& args) {
-  return grpc_channel_args_find_pointer<const ServerAddressList>(
-      &args, const_cast<char*>(GRPC_ARG_GRPCLB_BALANCER_ADDRESSES));
+    const ChannelArgs& args) {
+  return args.GetPointer<const ServerAddressList>(
+      GRPC_ARG_GRPCLB_BALANCER_ADDRESSES);
+}
+
+ChannelArgs SetGrpcLbBalancerAddresses(const ChannelArgs& args,
+                                       ServerAddressList address_list) {
+  return args.Set(
+      GRPC_ARG_GRPCLB_BALANCER_ADDRESSES,
+      ChannelArgs::Pointer(new ServerAddressList(std::move(address_list)),
+                           &kBalancerAddressesArgVtable));
 }
 
 }  // namespace grpc_core

data/src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_balancer_addresses.h

@@ -21,14 +21,18 @@
 
 #include <grpc/impl/codegen/grpc_types.h>
 
+#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/resolver/server_address.h"
 
 namespace grpc_core {
 
 grpc_arg CreateGrpclbBalancerAddressesArg(
     const ServerAddressList* address_list);
+GRPC_MUST_USE_RESULT
+ChannelArgs SetGrpcLbBalancerAddresses(const ChannelArgs& args,
+                                       ServerAddressList address_list);
 const ServerAddressList* FindGrpclbBalancerAddressesInChannelArgs(
-    const grpc_channel_args& args);
+    const ChannelArgs& args);
 
 }  // namespace grpc_core
 

data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.cc

@@ -26,6 +26,7 @@
 
 #include "google/protobuf/duration.upb.h"
 #include "google/protobuf/timestamp.upb.h"
+#include "upb/upb.h"
 
 #include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/support/log.h>

data/src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h

@@ -18,14 +18,13 @@
 
 #ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H
 #define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_LB_POLICY_GRPCLB_LOAD_BALANCER_API_H
-
 #include <grpc/support/port_platform.h>
 
 #include <stdint.h>
 
 #include <vector>
 
-#include "upb/upb.h"
+#include "upb/arena.h"
 
 #include <grpc/slice.h>
 

data/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.cc

@@ -76,7 +76,7 @@ class OrcaWatcher;
 // registered watchers.
 class OrcaProducer : public Subchannel::DataProducerInterface {
  public:
-  explicit OrcaProducer(RefCountedPtr<Subchannel> subchannel);
+  void Start(RefCountedPtr<Subchannel> subchannel);
 
   void Orphan() override;
 
@@ -288,9 +288,8 @@ class OrcaProducer::OrcaStreamEventHandler
 // OrcaProducer
 //
 
-OrcaProducer::OrcaProducer(RefCountedPtr<Subchannel> subchannel)
-    : subchannel_(std::move(subchannel)) {
-  subchannel_->AddDataProducer(this);
+void OrcaProducer::Start(RefCountedPtr<Subchannel> subchannel) {
+  subchannel_ = std::move(subchannel);
   connected_subchannel_ = subchannel_->connected_subchannel();
   auto connectivity_watcher = MakeRefCounted<ConnectivityWatcher>(WeakRef());
   connectivity_watcher_ = connectivity_watcher.get();
@@ -304,6 +303,7 @@ void OrcaProducer::Orphan() {
     MutexLock lock(&mu_);
     stream_client_.reset();
   }
+  GPR_ASSERT(subchannel_ != nullptr);  // Should not be called before Start().
   subchannel_->CancelConnectivityStateWatch(
       /*health_check_service_name=*/absl::nullopt, connectivity_watcher_);
   subchannel_->RemoveDataProducer(this);
@@ -384,14 +384,23 @@ OrcaWatcher::~OrcaWatcher() {
 }
 
 void OrcaWatcher::SetSubchannel(Subchannel* subchannel) {
+  bool created = false;
   // Check if our producer is already registered with the subchannel.
-  // If not, create a new one, which will register itself with the subchannel.
-  auto* p = static_cast<OrcaProducer*>(
-      subchannel->GetDataProducer(OrcaProducer::Type()));
-  if (p != nullptr) producer_ = p->RefIfNonZero();
-  if (producer_ == nullptr) {
-    producer_ = MakeRefCounted<OrcaProducer>(subchannel->Ref());
-  }
+  // If not, create a new one.
+  subchannel->GetOrAddDataProducer(
+      OrcaProducer::Type(), [&](Subchannel::DataProducerInterface** producer) {
+        if (*producer != nullptr) producer_ = (*producer)->RefIfNonZero();
+        if (producer_ == nullptr) {
+          producer_ = MakeRefCounted<OrcaProducer>();
+          *producer = producer_.get();
+          created = true;
+        }
+      });
+  // If we just created the producer, start it.
+  // This needs to be done outside of the lambda passed to
+  // GetOrAddDataProducer() to avoid deadlocking by re-acquiring the
+  // subchannel lock while already holding it.
+  if (created) producer_->Start(subchannel->Ref());
   // Register ourself with the producer.
   producer_->AddWatcher(this);
 }

data/src/core/ext/filters/client_channel/lb_policy/oob_backend_metric.h

@@ -22,8 +22,8 @@
 #include <memory>
 
 #include "src/core/ext/filters/client_channel/lb_policy/backend_metric_data.h"
-#include "src/core/ext/filters/client_channel/subchannel_interface.h"
 #include "src/core/lib/gprpp/time.h"
+#include "src/core/lib/load_balancing/subchannel_interface.h"
 
 namespace grpc_core {