grpc 1.83.2 → 1.84.0.pre1

data/src/core/client_channel/client_channel_filter.h

@@ -450,8 +450,8 @@ class ClientChannelFilter::LoadBalancedCall final
   // Set when we get a cancel_stream op.
   grpc_error_handle cancel_error_;
 
-  // Set when we fail inside the LB call.
-  grpc_error_handle failure_error_;
+  // Set when the LB picker returns a drop result.
+  bool is_drop_ = false;
 
   LbQueuedCallCanceller* lb_call_canceller_
       ABSL_GUARDED_BY(&ClientChannelFilter::lb_mu_) = nullptr;

data/src/core/client_channel/client_channel_service_config.cc

@@ -33,21 +33,6 @@
 namespace grpc_core {
 namespace internal {
 
-namespace {
-
-class ConnectionScalingJsonArgs final : public JsonArgs {
- public:
-  bool IsEnabled(absl::string_view key) const override {
-    if (key == "connection_scaling") {
-      return IsExperimentEnvVarEnabled(
-          "GRPC_EXPERIMENTAL_MAX_CONCURRENT_STREAMS_CONNECTION_SCALING");
-    }
-    return true;
-  }
-};
-
-}  // namespace
-
 //
 // ClientChannelGlobalParsedConfig::HealthCheckConfig
 //
@@ -93,8 +78,7 @@ const JsonLoaderInterface* ClientChannelGlobalParsedConfig::JsonLoader(
           .OptionalField("healthCheckConfig",
                          &ClientChannelGlobalParsedConfig::health_check_config_)
           .OptionalField("connectionScaling",
-                         &ClientChannelGlobalParsedConfig::connection_scaling_,
-                         "connection_scaling")
+                         &ClientChannelGlobalParsedConfig::connection_scaling_)
           .Finish();
   return loader;
 }
@@ -170,14 +154,14 @@ ClientChannelServiceConfigParser::ParseGlobalParams(const ChannelArgs& /*args*/,
                                                     const Json& json,
                                                     ValidationErrors* errors) {
   return LoadFromJson<std::unique_ptr<ClientChannelGlobalParsedConfig>>(
-      json, ConnectionScalingJsonArgs(), errors);
+      json, JsonArgs(), errors);
 }
 
 std::unique_ptr<ServiceConfigParser::ParsedConfig>
 ClientChannelServiceConfigParser::ParsePerMethodParams(
     const ChannelArgs& /*args*/, const Json& json, ValidationErrors* errors) {
   return LoadFromJson<std::unique_ptr<ClientChannelMethodParsedConfig>>(
-      json, ConnectionScalingJsonArgs(), errors);
+      json, JsonArgs(), errors);
 }
 
 }  // namespace internal

data/src/core/client_channel/direct_channel.cc

@@ -24,7 +24,13 @@
 namespace grpc_core {
 
 absl::StatusOr<RefCountedPtr<DirectChannel>> DirectChannel::Create(
-    std::string target, const ChannelArgs& args) {
+    std::string target, ChannelArgs args) {
+  auto channel_args_mutator =
+      grpc_channel_args_get_client_channel_creation_mutator();
+  if (channel_args_mutator != nullptr) {
+    args =
+        channel_args_mutator(target.c_str(), args, GRPC_CLIENT_DIRECT_CHANNEL);
+  }
   auto* transport = args.GetObject<Transport>();
   if (transport == nullptr) {
     return absl::InvalidArgumentError("Transport not set in ChannelArgs");

data/src/core/client_channel/direct_channel.h

@@ -41,8 +41,8 @@ class DirectChannel final : public Channel {
     OrphanablePtr<ClientTransport> transport_;
   };
 
-  static absl::StatusOr<RefCountedPtr<DirectChannel>> Create(
-      std::string target, const ChannelArgs& args);
+  static absl::StatusOr<RefCountedPtr<DirectChannel>> Create(std::string target,
+                                                             ChannelArgs args);
 
   DirectChannel(
       std::string target, const ChannelArgs& args,

data/src/core/client_channel/load_balanced_call_destination.cc

@@ -179,9 +179,11 @@ LoopCtl<absl::StatusOr<RefCountedPtr<UnstartedCallDestination>>> PickSubchannel(
         GRPC_TRACE_LOG(client_channel_lb_call, INFO)
             << "client_channel: " << GetContext<Activity>()->DebugTag()
             << " pick dropped: " << drop_pick->status;
-        return grpc_error_set_int(MaybeRewriteIllegalStatusCode(
-                                      std::move(drop_pick->status), "LB drop"),
-                                  StatusIntProperty::kLbPolicyDrop, 1);
+        // TODO(roth): Need to set the LbPolicyDrop trait in server
+        // trailing metadata, so that the retry interceptor can know not
+        // to retry.
+        return MaybeRewriteIllegalStatusCode(std::move(drop_pick->status),
+                                             "LB drop");
       });
 }
 

data/src/core/client_channel/retry_filter_legacy_call_data.cc

@@ -653,9 +653,7 @@ void RetryFilter::LegacyCallData::CallAttempt::OnPerAttemptRecvTimerLocked(
     // TODO(roth): When implementing hedging, we should not cancel the
     // current attempt.
     call_attempt->MaybeAddBatchForCancelOp(
-        grpc_error_set_int(
-            GRPC_ERROR_CREATE("retry perAttemptRecvTimeout exceeded"),
-            StatusIntProperty::kRpcStatus, GRPC_STATUS_CANCELLED),
+        absl::CancelledError("retry perAttemptRecvTimeout exceeded"),
         &closures);
     // Check whether we should retry.
     if (call_attempt->ShouldRetry(/*status=*/std::nullopt,
@@ -960,14 +958,10 @@ void GetCallStatus(
     std::optional<GrpcStreamNetworkState::ValueType>* stream_network_state) {
   if (!error.ok()) {
     grpc_error_get_status(error, deadline, status, nullptr, nullptr, nullptr);
-    intptr_t value = 0;
-    if (grpc_error_get_int(error, StatusIntProperty::kLbPolicyDrop, &value) &&
-        value != 0) {
-      *is_lb_drop = true;
-    }
   } else {
     *status = md_batch->get(GrpcStatusMetadata()).value_or(GRPC_STATUS_UNKNOWN);
   }
+  *is_lb_drop = md_batch->get(LbPolicyDrop()).value_or(false);
   *server_pushback = md_batch->get(GrpcRetryPushbackMsMetadata());
   *stream_network_state = md_batch->get(GrpcStreamNetworkState());
 }
@@ -1136,10 +1130,7 @@ void RetryFilter::LegacyCallData::CallAttempt::BatchData::
       CallCombinerClosureList closures;
       // Cancel call attempt.
       call_attempt->MaybeAddBatchForCancelOp(
-          error.ok() ? grpc_error_set_int(
-                           GRPC_ERROR_CREATE("call attempt failed"),
-                           StatusIntProperty::kRpcStatus, GRPC_STATUS_CANCELLED)
-                     : error,
+          error.ok() ? absl::CancelledError("call attempt failed") : error,
           &closures);
       // For transparent retries, add a closure to immediately start a new
       // call attempt.
@@ -1916,6 +1907,8 @@ void RetryFilter::LegacyCallData::OnRetryTimerLocked(
   if (calld->retry_timer_handle_ != TaskHandle::kInvalid) {
     calld->retry_timer_handle_ = TaskHandle::kInvalid;
     calld->CreateCallAttempt(/*is_transparent_retry=*/false);
+  } else {
+    GRPC_CALL_COMBINER_STOP(calld->call_combiner_, "retry timer cancelled");
   }
   GRPC_CALL_STACK_UNREF(calld->owning_call_, "OnRetryTimer");
 }