grpc 1.63.2 → 1.64.0.pre1

data/src/core/{ext/xds → xds/xds_client}/xds_client.cc

@@ -14,9 +14,7 @@
 // limitations under the License.
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_client.h"
+#include "src/core/xds/xds_client/xds_client.h"
 
 #include <inttypes.h>
 #include <string.h>
@@ -29,6 +27,7 @@
 #include <vector>
 
 #include "absl/cleanup/cleanup.h"
+#include "absl/log/check.h"
 #include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
@@ -45,11 +44,8 @@
 
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/upb_utils.h"
-#include "src/core/ext/xds/xds_api.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/ext/xds/xds_client_stats.h"
 #include "src/core/lib/backoff/backoff.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/orphanable.h"
@@ -57,6 +53,10 @@
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/xds/grpc/upb_utils.h"
+#include "src/core/xds/xds_client/xds_api.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "src/core/xds/xds_client/xds_client_stats.h"
 
 #define GRPC_XDS_INITIAL_CONNECT_BACKOFF_SECONDS 1
 #define GRPC_XDS_RECONNECT_BACKOFF_MULTIPLIER 1.6
@@ -473,7 +473,7 @@ XdsClient::XdsChannel::XdsChannel(WeakRefCountedPtr<XdsClient> xds_client,
         self->OnConnectivityFailure(std::move(status));
       },
       &status);
-  GPR_ASSERT(transport_ != nullptr);
+  CHECK(transport_ != nullptr);
   if (!status.ok()) SetChannelStatusLocked(std::move(status));
 }
 
@@ -642,6 +642,10 @@ void XdsClient::XdsChannel::SetChannelStatusLocked(absl::Status status) {
         absl::StrCat(status.message(),
                      " (node ID:", xds_client_->bootstrap_->node()->id(), ")"));
   }
+  // If status was previously OK, report that the channel has gone unhealthy.
+  if (status_.ok() && xds_client_->metrics_reporter_ != nullptr) {
+    xds_client_->metrics_reporter_->ReportServerFailure(server_.server_uri());
+  }
   // Save status in channel, so that we can immediately generate an
   // error for any new watchers that may be started.
   status_ = status;
@@ -714,8 +718,8 @@ void XdsClient::XdsChannel::RetryableCall<T>::OnCallFinishedLocked() {
 template <typename T>
 void XdsClient::XdsChannel::RetryableCall<T>::StartNewCallLocked() {
   if (shutting_down_) return;
-  GPR_ASSERT(xds_channel_->transport_ != nullptr);
-  GPR_ASSERT(call_ == nullptr);
+  CHECK(xds_channel_->transport_ != nullptr);
+  CHECK(call_ == nullptr);
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
     gpr_log(GPR_INFO,
             "[xds_client %p] xds server %s: start new call from retryable "
@@ -1002,7 +1006,7 @@ XdsClient::XdsChannel::AdsCall::AdsCall(
           GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_refcount_trace) ? "AdsCall"
                                                                   : nullptr),
       retryable_call_(std::move(retryable_call)) {
-  GPR_ASSERT(xds_client() != nullptr);
+  CHECK_NE(xds_client(), nullptr);
   // Init the ADS call.
   const char* method =
       "/envoy.service.discovery.v3.AggregatedDiscoveryService/"
@@ -1012,7 +1016,7 @@ XdsClient::XdsChannel::AdsCall::AdsCall(
                   // Passing the initial ref here.  This ref will go away when
                   // the StreamEventHandler is destroyed.
                   RefCountedPtr<AdsCall>(this)));
-  GPR_ASSERT(streaming_call_ != nullptr);
+  CHECK(streaming_call_ != nullptr);
   // Start the call.
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
     gpr_log(GPR_INFO,
@@ -1366,7 +1370,7 @@ XdsClient::XdsChannel::LrsCall::LrsCall(
   // Init the LRS call. Note that the call will progress every time there's
   // activity in xds_client()->interested_parties_, which is comprised of
   // the polling entities from client_channel.
-  GPR_ASSERT(xds_client() != nullptr);
+  CHECK_NE(xds_client(), nullptr);
   const char* method =
       "/envoy.service.load_stats.v3.LoadReportingService/StreamLoadStats";
   streaming_call_ = xds_channel()->transport_->CreateStreamingCall(
@@ -1374,7 +1378,7 @@ XdsClient::XdsChannel::LrsCall::LrsCall(
                   // Passing the initial ref here.  This ref will go away when
                   // the StreamEventHandler is destroyed.
                   RefCountedPtr<LrsCall>(this)));
-  GPR_ASSERT(streaming_call_ != nullptr);
+  CHECK(streaming_call_ != nullptr);
   // Start the call.
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
     gpr_log(GPR_INFO,
@@ -1595,7 +1599,7 @@ XdsClient::XdsClient(
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
     gpr_log(GPR_INFO, "[xds_client %p] creating xds client", this);
   }
-  GPR_ASSERT(bootstrap_ != nullptr);
+  CHECK(bootstrap_ != nullptr);
   if (bootstrap_->node() != nullptr) {
     gpr_log(GPR_INFO, "[xds_client %p] xDS node ID: %s", this,
             bootstrap_->node()->id().c_str());
@@ -1850,7 +1854,7 @@ void XdsClient::MaybeRegisterResourceTypeLocked(
     const XdsResourceType* resource_type) {
   auto it = resource_types_.find(resource_type->type_url());
   if (it != resource_types_.end()) {
-    GPR_ASSERT(it->second == resource_type);
+    CHECK(it->second == resource_type);
     return;
   }
   resource_types_.emplace(resource_type->type_url(), resource_type);
@@ -1901,7 +1905,7 @@ std::string XdsClient::ConstructFullXdsResourceName(
     auto uri = URI::Create("xdstp", std::string(authority),
                            absl::StrCat("/", resource_type, "/", key.id),
                            key.query_params, /*fragment=*/"");
-    GPR_ASSERT(uri.ok());
+    CHECK(uri.ok());
     return uri->ToString();
   }
   // Old-style name.

data/src/core/{ext/xds → xds/xds_client}/xds_client.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H
 
 #include <map>
 #include <memory>
@@ -33,13 +31,8 @@
 #include "upb/reflection/def.hpp"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/xds_api.h"
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/ext/xds/xds_client_stats.h"
-#include "src/core/ext/xds/xds_metrics.h"
-#include "src/core/ext/xds/xds_resource_type.h"
-#include "src/core/ext/xds/xds_transport.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/dual_ref_counted.h"
 #include "src/core/lib/gprpp/orphanable.h"
@@ -49,6 +42,12 @@
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/gprpp/work_serializer.h"
 #include "src/core/lib/uri/uri_parser.h"
+#include "src/core/xds/xds_client/xds_api.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
+#include "src/core/xds/xds_client/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_metrics.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
+#include "src/core/xds/xds_client/xds_transport.h"
 
 namespace grpc_core {
 
@@ -388,4 +387,4 @@ class XdsClient : public DualRefCounted<XdsClient> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_H

data/src/core/{ext/xds → xds/xds_client}/xds_client_stats.cc

@@ -16,15 +16,14 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
-#include "src/core/ext/xds/xds_client_stats.h"
+#include "src/core/xds/xds_client/xds_client_stats.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
-#include "src/core/ext/xds/xds_client.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/xds/xds_client/xds_client.h"
 
 namespace grpc_core {
 
@@ -106,25 +105,23 @@ XdsClusterLocalityStats::XdsClusterLocalityStats(
       eds_service_name_(eds_service_name),
       name_(std::move(name)) {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
-    gpr_log(
-        GPR_INFO,
-        "[xds_client %p] created locality stats %p for {%s, %s, %s, %s}",
-        xds_client_.get(), this, std::string(lrs_server_).c_str(),
-        std::string(cluster_name_).c_str(),
-        std::string(eds_service_name_).c_str(),
-        name_ == nullptr ? "<none>" : name_->human_readable_string().c_str());
+    gpr_log(GPR_INFO,
+            "[xds_client %p] created locality stats %p for {%s, %s, %s, %s}",
+            xds_client_.get(), this, std::string(lrs_server_).c_str(),
+            std::string(cluster_name_).c_str(),
+            std::string(eds_service_name_).c_str(),
+            name_->human_readable_string().c_str());
   }
 }
 
 XdsClusterLocalityStats::~XdsClusterLocalityStats() {
   if (GRPC_TRACE_FLAG_ENABLED(grpc_xds_client_trace)) {
-    gpr_log(
-        GPR_INFO,
-        "[xds_client %p] destroying locality stats %p for {%s, %s, %s, %s}",
-        xds_client_.get(), this, std::string(lrs_server_).c_str(),
-        std::string(cluster_name_).c_str(),
-        std::string(eds_service_name_).c_str(),
-        name_ == nullptr ? "<none>" : name_->human_readable_string().c_str());
+    gpr_log(GPR_INFO,
+            "[xds_client %p] destroying locality stats %p for {%s, %s, %s, %s}",
+            xds_client_.get(), this, std::string(lrs_server_).c_str(),
+            std::string(cluster_name_).c_str(),
+            std::string(eds_service_name_).c_str(),
+            name_->human_readable_string().c_str());
   }
   xds_client_->RemoveClusterLocalityStats(lrs_server_, cluster_name_,
                                           eds_service_name_, name_, this);

data/src/core/{ext/xds → xds/xds_client}/xds_client_stats.h

@@ -16,10 +16,8 @@
 //
 //
 
-#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>
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H
 
 #include <atomic>
 #include <cstdint>
@@ -31,7 +29,8 @@
 #include "absl/strings/str_format.h"
 #include "absl/strings/string_view.h"
 
-#include "src/core/ext/xds/xds_bootstrap.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/channel/call_tracer.h"
 #include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/per_cpu.h"
@@ -39,6 +38,7 @@
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/resolver/endpoint_addresses.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
 
 namespace grpc_core {
 
@@ -255,4 +255,4 @@ class XdsClusterLocalityStats final
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_CLIENT_STATS_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_CLIENT_STATS_H

data/src/core/{ext/xds → xds/xds_client}/xds_metrics.h

@@ -14,13 +14,13 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H
 
 #include "absl/strings/string_view.h"
 
+#include <grpc/support/port_platform.h>
+
 namespace grpc_core {
 
 // An interface for XdsClient to report metrics.
@@ -32,8 +32,10 @@ class XdsMetricsReporter {
                                      absl::string_view resource_type,
                                      uint64_t num_valid,
                                      uint64_t num_invalid) = 0;
+
+  virtual void ReportServerFailure(absl::string_view xds_server) = 0;
 };
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_METRICS_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_METRICS_H

data/src/core/{ext/xds → xds/xds_client}/xds_resource_type.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#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>
-
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H
 #include <memory>
 #include <string>
 
@@ -27,8 +25,10 @@
 #include "upb/mem/arena.h"
 #include "upb/reflection/def.h"
 
-#include "src/core/ext/xds/xds_bootstrap.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/debug/trace.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
 
 namespace grpc_core {
 
@@ -95,4 +95,4 @@ class XdsResourceType {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_H

data/src/core/{ext/xds → xds/xds_client}/xds_resource_type_impl.h

@@ -14,18 +14,18 @@
 // limitations under the License.
 //
 
-#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>
-
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H
 #include <memory>
 #include <utility>
 
 #include "absl/strings/string_view.h"
 
-#include "src/core/ext/xds/xds_client.h"
-#include "src/core/ext/xds/xds_resource_type.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/xds/xds_client/xds_client.h"
+#include "src/core/xds/xds_client/xds_resource_type.h"
 
 namespace grpc_core {
 
@@ -85,4 +85,4 @@ class XdsResourceTypeImpl : public XdsResourceType {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_RESOURCE_TYPE_IMPL_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_RESOURCE_TYPE_IMPL_H

data/src/core/{ext/xds → xds/xds_client}/xds_transport.h

@@ -14,10 +14,8 @@
 // limitations under the License.
 //
 
-#ifndef GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
-#define GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
-
-#include <grpc/support/port_platform.h>
+#ifndef GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H
+#define GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H
 
 #include <functional>
 #include <memory>
@@ -26,8 +24,10 @@
 #include "absl/status/status.h"
 #include "absl/strings/string_view.h"
 
-#include "src/core/ext/xds/xds_bootstrap.h"
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/gprpp/orphanable.h"
+#include "src/core/xds/xds_client/xds_bootstrap.h"
 
 namespace grpc_core {
 
@@ -86,4 +86,4 @@ class XdsTransportFactory : public InternallyRefCounted<XdsTransportFactory> {
 
 }  // namespace grpc_core
 
-#endif  // GRPC_SRC_CORE_EXT_XDS_XDS_TRANSPORT_H
+#endif  // GRPC_SRC_CORE_XDS_XDS_CLIENT_XDS_TRANSPORT_H

data/src/ruby/ext/grpc/rb_call_credentials.c

@@ -27,6 +27,7 @@
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
+#include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>

data/src/ruby/ext/grpc/rb_call_credentials.h

@@ -21,6 +21,7 @@
 
 #include <ruby/ruby.h>
 
+#include <grpc/credentials.h>
 #include <grpc/grpc_security.h>
 
 /* Initializes the ruby CallCredentials class. */

data/src/ruby/ext/grpc/rb_channel.c

@@ -32,6 +32,7 @@
 #include "rb_server.h"
 #include "rb_xds_channel_credentials.h"
 
+#include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>

data/src/ruby/ext/grpc/rb_channel_credentials.c

@@ -26,6 +26,7 @@
 #include "rb_grpc.h"
 #include "rb_grpc_imports.generated.h"
 
+#include <grpc/credentials.h>
 #include <grpc/grpc.h>
 #include <grpc/grpc_security.h>
 #include <grpc/support/alloc.h>