grpc 1.46.2 → 1.48.0.pre1

data/src/core/lib/surface/server.h

@@ -19,26 +19,54 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <atomic>
+#include <functional>
 #include <list>
+#include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
+#include "absl/base/thread_annotations.h"
+#include "absl/memory/memory.h"
 #include "absl/status/statusor.h"
 #include "absl/synchronization/notification.h"
 #include "absl/types/optional.h"
 
 #include <grpc/grpc.h>
+#include <grpc/impl/codegen/gpr_types.h>
+#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/slice.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/channel/channel_args.h"
+#include "src/core/lib/channel/channel_fwd.h"
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/channelz.h"
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/cpp_impl_of.h"
 #include "src/core/lib/gprpp/dual_ref_counted.h"
-#include "src/core/lib/iomgr/resolve_address.h"
-#include "src/core/lib/resource_quota/memory_quota.h"
+#include "src/core/lib/gprpp/orphanable.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/gprpp/time.h"
+#include "src/core/lib/iomgr/call_combiner.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/endpoint.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/lib/iomgr/pollset.h"
+#include "src/core/lib/slice/slice.h"
+#include "src/core/lib/surface/channel.h"
 #include "src/core/lib/surface/completion_queue.h"
+#include "src/core/lib/transport/metadata_batch.h"
 #include "src/core/lib/transport/transport.h"
+#include "src/core/lib/transport/transport_fwd.h"
+
+struct grpc_server_config_fetcher;
 
 namespace grpc_core {
 
@@ -96,7 +124,7 @@ class Server : public InternallyRefCounted<Server>,
     virtual void SetOnDestroyDone(grpc_closure* on_destroy_done) = 0;
   };
 
-  explicit Server(const grpc_channel_args* args);
+  explicit Server(ChannelArgs args);
   ~Server() override;
 
   void Orphan() ABSL_LOCKS_EXCLUDED(mu_global_) override;
@@ -167,8 +195,12 @@ class Server : public InternallyRefCounted<Server>,
   void ShutdownAndNotify(grpc_completion_queue* cq, void* tag)
       ABSL_LOCKS_EXCLUDED(mu_global_, mu_call_);
 
+  void StopListening();
+
   void CancelAllCalls() ABSL_LOCKS_EXCLUDED(mu_global_);
 
+  void SendGoaways() ABSL_LOCKS_EXCLUDED(mu_global_, mu_call_);
+
  private:
   struct RequestedCall;
 
@@ -191,12 +223,13 @@ class Server : public InternallyRefCounted<Server>,
     ChannelData() = default;
     ~ChannelData();
 
-    void InitTransport(RefCountedPtr<Server> server, grpc_channel* channel,
-                       size_t cq_idx, grpc_transport* transport,
+    void InitTransport(RefCountedPtr<Server> server,
+                       RefCountedPtr<Channel> channel, size_t cq_idx,
+                       grpc_transport* transport,
                        intptr_t channelz_socket_uuid);
 
     RefCountedPtr<Server> server() const { return server_; }
-    grpc_channel* channel() const { return channel_; }
+    Channel* channel() const { return channel_.get(); }
     size_t cq_idx() const { return cq_idx_; }
 
     ChannelRegisteredMethod* GetRegisteredMethod(const grpc_slice& host,
@@ -218,7 +251,7 @@ class Server : public InternallyRefCounted<Server>,
     static void FinishDestroy(void* arg, grpc_error_handle error);
 
     RefCountedPtr<Server> server_;
-    grpc_channel* channel_;
+    RefCountedPtr<Channel> channel_;
     // The index into Server::cqs_ of the CQ used as a starting point for
     // where to publish new incoming calls.
     size_t cq_idx_;
@@ -363,7 +396,7 @@ class Server : public InternallyRefCounted<Server>,
       size_t* cq_idx, grpc_completion_queue* cq_for_notification, void* tag,
       grpc_byte_buffer** optional_payload, RegisteredMethod* rm);
 
-  std::vector<grpc_channel*> GetChannelsLocked() const;
+  std::vector<RefCountedPtr<Channel>> GetChannelsLocked() const;
 
   // Take a shutdown ref for a request (increment by 2) and return if shutdown
   // has not been called.
@@ -410,7 +443,7 @@ class Server : public InternallyRefCounted<Server>,
     return shutdown_refs_.load(std::memory_order_acquire) == 0;
   }
 
-  grpc_channel_args* const channel_args_;
+  const grpc_channel_args* const channel_args_;
   RefCountedPtr<channelz::ServerNode> channelz_node_;
   std::unique_ptr<grpc_server_config_fetcher> config_fetcher_;
 

data/src/core/lib/surface/validate_metadata.cc

@@ -20,17 +20,14 @@
 
 #include "src/core/lib/surface/validate_metadata.h"
 
-#include <stdlib.h>
-#include <string.h>
+#include "absl/strings/string_view.h"
 
 #include <grpc/grpc.h>
-#include <grpc/support/alloc.h>
 
+#include "src/core/lib/gpr/string.h"
 #include "src/core/lib/gprpp/bitset.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/slice/slice_string_helpers.h"
 
 #if __cplusplus > 201103l
 #define GRPC_VALIDATE_METADATA_CONSTEXPR_FN constexpr
@@ -63,7 +60,7 @@ static grpc_error_handle conforms_to(const grpc_slice& slice,
 }
 
 static int error2int(grpc_error_handle error) {
-  int r = (error == GRPC_ERROR_NONE);
+  int r = (GRPC_ERROR_IS_NONE(error));
   GRPC_ERROR_UNREF(error);
   return r;
 }

data/src/core/lib/surface/validate_metadata.h

@@ -21,9 +21,12 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <stdint.h>
+
 #include <cstring>
 
 #include <grpc/slice.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/iomgr/error.h"
 

data/src/core/lib/surface/version.cc

@@ -23,6 +23,6 @@
 
 #include <grpc/grpc.h>
 
-const char* grpc_version_string(void) { return "24.0.0"; }
+const char* grpc_version_string(void) { return "26.0.0"; }
 
-const char* grpc_g_stands_for(void) { return "golazo"; }
+const char* grpc_g_stands_for(void) { return "garum"; }

data/src/core/lib/transport/bdp_estimator.cc

@@ -23,7 +23,9 @@
 #include <inttypes.h>
 #include <stdlib.h>
 
-#include "src/core/lib/gpr/useful.h"
+#include <algorithm>
+
+#include "src/core/lib/iomgr/exec_ctx.h"
 
 grpc_core::TraceFlag grpc_bdp_estimator_trace(false, "bdp_estimator");
 

data/src/core/lib/transport/bdp_estimator.h

@@ -22,14 +22,13 @@
 #include <grpc/support/port_platform.h>
 
 #include <inttypes.h>
-#include <stdbool.h>
-#include <stdint.h>
 
+#include <grpc/impl/codegen/gpr_types.h>
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/gprpp/time.h"
 
 extern grpc_core::TraceFlag grpc_bdp_estimator_trace;
 

data/src/core/lib/transport/connectivity_state.cc

@@ -20,13 +20,15 @@
 
 #include "src/core/lib/transport/connectivity_state.h"
 
-#include <string.h>
+#include <string>
+#include <type_traits>
 
-#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
-#include "src/core/lib/iomgr/combiner.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 
 namespace grpc_core {

data/src/core/lib/transport/connectivity_state.h

@@ -24,15 +24,14 @@
 #include <atomic>
 #include <map>
 #include <memory>
+#include <utility>
 
 #include "absl/status/status.h"
 
-#include <grpc/grpc.h>
+#include <grpc/impl/codegen/connectivity_state.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/orphanable.h"
-#include "src/core/lib/iomgr/closure.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/work_serializer.h"
 
 namespace grpc_core {

data/src/core/lib/transport/error_utils.cc

@@ -20,13 +20,21 @@
 
 #include "src/core/lib/transport/error_utils.h"
 
+#include <stdint.h>
+
+#include <vector>
+
+#include "absl/strings/string_view.h"
+
 #include <grpc/support/string_util.h>
 
 #include "src/core/lib/gprpp/status_helper.h"
-#include "src/core/lib/iomgr/error_internal.h"
-#include "src/core/lib/slice/slice_internal.h"
 #include "src/core/lib/transport/status_conversion.h"
 
+#ifndef GRPC_ERROR_IS_ABSEIL_STATUS
+#include "src/core/lib/iomgr/error_internal.h"
+#endif
+
 static grpc_error_handle recursively_find_error_with_field(
     grpc_error_handle error, grpc_error_ints which) {
   intptr_t unused;
@@ -38,7 +46,7 @@ static grpc_error_handle recursively_find_error_with_field(
   std::vector<absl::Status> children = grpc_core::StatusGetChildren(error);
   for (const absl::Status& child : children) {
     grpc_error_handle result = recursively_find_error_with_field(child, which);
-    if (result != GRPC_ERROR_NONE) return result;
+    if (!GRPC_ERROR_IS_NONE(result)) return result;
   }
 #else
   if (grpc_error_is_special(error)) return GRPC_ERROR_NONE;
@@ -62,7 +70,7 @@ void grpc_error_get_status(grpc_error_handle error,
                            grpc_http2_error_code* http_error,
                            const char** error_string) {
   // Fast path: We expect no error.
-  if (GPR_LIKELY(error == GRPC_ERROR_NONE)) {
+  if (GPR_LIKELY(GRPC_ERROR_IS_NONE(error))) {
     if (code != nullptr) *code = GRPC_STATUS_OK;
     if (message != nullptr) {
       // Normally, we call grpc_error_get_str(
@@ -85,7 +93,7 @@ void grpc_error_get_status(grpc_error_handle error,
   // until we find the first one that has a status code.
   grpc_error_handle found_error =
       recursively_find_error_with_field(error, GRPC_ERROR_INT_GRPC_STATUS);
-  if (found_error == GRPC_ERROR_NONE) {
+  if (GRPC_ERROR_IS_NONE(found_error)) {
     /// If no grpc-status exists, retry through the tree to find a http2 error
     /// code
     found_error =
@@ -94,7 +102,7 @@ void grpc_error_get_status(grpc_error_handle error,
 
   // If we found an error with a status code above, use that; otherwise,
   // fall back to using the parent error.
-  if (found_error == GRPC_ERROR_NONE) found_error = error;
+  if (GRPC_ERROR_IS_NONE(found_error)) found_error = error;
 
   grpc_status_code status = GRPC_STATUS_UNKNOWN;
   intptr_t integer;
@@ -123,8 +131,8 @@ void grpc_error_get_status(grpc_error_handle error,
       *http_error =
           grpc_status_to_http2_error(static_cast<grpc_status_code>(integer));
     } else {
-      *http_error = found_error == GRPC_ERROR_NONE ? GRPC_HTTP2_NO_ERROR
-                                                   : GRPC_HTTP2_INTERNAL_ERROR;
+      *http_error = GRPC_ERROR_IS_NONE(found_error) ? GRPC_HTTP2_NO_ERROR
+                                                    : GRPC_HTTP2_INTERNAL_ERROR;
     }
   }
 

data/src/core/lib/transport/error_utils.h

@@ -21,10 +21,14 @@
 
 #include <grpc/support/port_platform.h>
 
+#include <string>
+
 #include "absl/status/status.h"
 
+#include <grpc/status.h>
+
+#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/error.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/transport/http2_errors.h"
 
 /// A utility function to get the status code and message to be returned

data/src/core/lib/{channel → transport}/handshaker.cc

@@ -18,19 +18,23 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/channel/handshaker.h"
+#include "src/core/lib/transport/handshaker.h"
 
-#include <string.h>
+#include <inttypes.h>
+
+#include <string>
+#include <utility>
 
 #include "absl/strings/str_format.h"
 
-#include <grpc/impl/codegen/slice.h>
+#include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
 #include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/debug/trace.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/slice/slice_internal.h"
 
@@ -96,9 +100,9 @@ bool HandshakeManager::CallNextHandshakerLocked(grpc_error_handle error) {
   // If we got an error or we've been shut down or we're exiting early or
   // we've finished the last handshaker, invoke the on_handshake_done
   // callback.  Otherwise, call the next handshaker.
-  if (error != GRPC_ERROR_NONE || is_shutdown_ || args_.exit_early ||
+  if (!GRPC_ERROR_IS_NONE(error) || is_shutdown_ || args_.exit_early ||
       index_ == handshakers_.size()) {
-    if (error == GRPC_ERROR_NONE && is_shutdown_) {
+    if (GRPC_ERROR_IS_NONE(error) && is_shutdown_) {
       error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("handshaker shutdown");
       // It is possible that the endpoint has already been destroyed by
       // a shutdown call while this callback was sitting on the ExecCtx
@@ -161,7 +165,7 @@ void HandshakeManager::CallNextHandshakerFn(void* arg,
 
 void HandshakeManager::OnTimeoutFn(void* arg, grpc_error_handle error) {
   auto* mgr = static_cast<HandshakeManager*>(arg);
-  if (error == GRPC_ERROR_NONE) {  // Timer fired, rather than being cancelled
+  if (GRPC_ERROR_IS_NONE(error)) {  // Timer fired, rather than being cancelled
     mgr->Shutdown(GRPC_ERROR_CREATE_FROM_STATIC_STRING("Handshake timed out"));
   }
   mgr->Unref();
@@ -180,6 +184,7 @@ void HandshakeManager::DoHandshake(grpc_endpoint* endpoint,
     // Construct handshaker args.  These will be passed through all
     // handshakers and eventually be freed by the on_handshake_done callback.
     args_.endpoint = endpoint;
+    args_.deadline = deadline;
     args_.args = grpc_channel_args_copy(channel_args);
     args_.user_data = user_data;
     args_.read_buffer =

data/src/core/lib/{channel → transport}/handshaker.h

@@ -16,22 +16,25 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_CHANNEL_HANDSHAKER_H
-#define GRPC_CORE_LIB_CHANNEL_HANDSHAKER_H
+#ifndef GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_H
+#define GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_H
 
 #include <grpc/support/port_platform.h>
 
+#include <stddef.h>
+
 #include "absl/container/inlined_vector.h"
 
 #include <grpc/impl/codegen/grpc_types.h>
-#include <grpc/support/string_util.h>
+#include <grpc/slice.h>
 
-#include "src/core/lib/channel/channel_args.h"
 #include "src/core/lib/gprpp/ref_counted.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
+#include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/endpoint.h"
-#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/error.h"
 #include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/iomgr/timer.h"
 
@@ -68,6 +71,10 @@ struct HandshakerArgs {
   // User data passed through the handshake manager.  Not used by
   // individual handshakers.
   void* user_data = nullptr;
+  // Deadline associated with the handshake.
+  // TODO(anramach): Move this out of handshake args after event engine
+  // is the default.
+  Timestamp deadline;
 };
 
 ///
@@ -158,4 +165,4 @@ typedef grpc_core::Handshaker grpc_handshaker;
 void grpc_handshake_manager_add(grpc_handshake_manager* mgr,
                                 grpc_handshaker* handshaker);
 
-#endif /* GRPC_CORE_LIB_CHANNEL_HANDSHAKER_H */
+#endif /* GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_H */

data/src/core/lib/{channel → transport}/handshaker_factory.h

@@ -16,22 +16,21 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_CHANNEL_HANDSHAKER_FACTORY_H
-#define GRPC_CORE_LIB_CHANNEL_HANDSHAKER_FACTORY_H
+#ifndef GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H
+#define GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H
 
 #include <grpc/support/port_platform.h>
 
 #include <grpc/impl/codegen/grpc_types.h>
 
-// A handshaker factory is used to create handshakers.
+#include "src/core/lib/iomgr/iomgr_fwd.h"
 
-// TODO(ctiller): grpc_pollset_set and HandshakeManager are forward declared in
-// this file. grpc_pollset_set ought to be eliminated when EventEngine lands IO
-// support. At the same time, we ought to be able to include handshake_manager.h
-// here and eliminate the HandshakeManager dependency - we cannot right now
-// because HandshakeManager names too many iomgr types.
+// A handshaker factory is used to create handshakers.
 
-typedef struct grpc_pollset_set grpc_pollset_set;
+// TODO(ctiller): HandshakeManager is forward declared in this file. When
+// EventEngine lands IO support we ought to be able to include
+// handshake_manager.h here and eliminate the HandshakeManager dependency - we
+// cannot right now because HandshakeManager names too many iomgr types.
 
 namespace grpc_core {
 
@@ -47,4 +46,4 @@ class HandshakerFactory {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_CHANNEL_HANDSHAKER_FACTORY_H */
+#endif /* GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_FACTORY_H */

data/src/core/lib/{channel → transport}/handshaker_registry.cc

@@ -18,7 +18,11 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/channel/handshaker_registry.h"
+#include "src/core/lib/transport/handshaker_registry.h"
+
+#include <stddef.h>
+
+#include <utility>
 
 namespace grpc_core {
 

data/src/core/lib/{channel → transport}/handshaker_registry.h

@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef GRPC_CORE_LIB_CHANNEL_HANDSHAKER_REGISTRY_H
-#define GRPC_CORE_LIB_CHANNEL_HANDSHAKER_REGISTRY_H
+#ifndef GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H
+#define GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H
 
 #include <grpc/support/port_platform.h>
 
@@ -26,7 +26,8 @@
 
 #include <grpc/impl/codegen/grpc_types.h>
 
-#include "src/core/lib/channel/handshaker_factory.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/lib/transport/handshaker_factory.h"
 
 namespace grpc_core {
 
@@ -68,4 +69,4 @@ class HandshakerRegistry {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_CHANNEL_HANDSHAKER_REGISTRY_H */
+#endif /* GRPC_CORE_LIB_TRANSPORT_HANDSHAKER_REGISTRY_H */

data/src/core/{ext/filters/client_channel → lib/transport}/http_connect_handshaker.cc

@@ -18,29 +18,43 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/ext/filters/client_channel/http_connect_handshaker.h"
+#include "src/core/lib/transport/http_connect_handshaker.h"
 
+#include <limits.h>
 #include <string.h>
 
+#include <memory>
+#include <string>
+
+#include "absl/base/thread_annotations.h"
+#include "absl/memory/memory.h"
 #include "absl/strings/str_cat.h"
+#include "absl/strings/string_view.h"
 
+#include <grpc/impl/codegen/grpc_types.h>
+#include <grpc/slice.h>
 #include <grpc/slice_buffer.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
-#include <grpc/support/string_util.h>
 
-#include "src/core/ext/filters/client_channel/client_channel.h"
 #include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/channel/handshaker.h"
-#include "src/core/lib/channel/handshaker_registry.h"
 #include "src/core/lib/config/core_configuration.h"
 #include "src/core/lib/gpr/string.h"
+#include "src/core/lib/gprpp/debug_location.h"
+#include "src/core/lib/gprpp/ref_counted_ptr.h"
 #include "src/core/lib/gprpp/sync.h"
 #include "src/core/lib/http/format_request.h"
 #include "src/core/lib/http/parser.h"
-#include "src/core/lib/resolver/resolver_registry.h"
+#include "src/core/lib/iomgr/closure.h"
+#include "src/core/lib/iomgr/endpoint.h"
+#include "src/core/lib/iomgr/error.h"
+#include "src/core/lib/iomgr/exec_ctx.h"
+#include "src/core/lib/iomgr/iomgr_fwd.h"
+#include "src/core/lib/iomgr/tcp_server.h"
 #include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/uri/uri_parser.h"
+#include "src/core/lib/transport/handshaker.h"
+#include "src/core/lib/transport/handshaker_factory.h"
+#include "src/core/lib/transport/handshaker_registry.h"
 
 namespace grpc_core {
 
@@ -111,7 +125,7 @@ void HttpConnectHandshaker::CleanupArgsForFailureLocked() {
 // If the handshake failed or we're shutting down, clean up and invoke the
 // callback with the error.
 void HttpConnectHandshaker::HandshakeFailedLocked(grpc_error_handle error) {
-  if (error == GRPC_ERROR_NONE) {
+  if (GRPC_ERROR_IS_NONE(error)) {
     // If we were shut down after an endpoint operation succeeded but
     // before the endpoint callback was invoked, we need to generate our
     // own error.
@@ -150,7 +164,7 @@ void HttpConnectHandshaker::OnWriteDoneScheduler(void* arg,
 void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error_handle error) {
   auto* handshaker = static_cast<HttpConnectHandshaker*>(arg);
   ReleasableMutexLock lock(&handshaker->mu_);
-  if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) {
+  if (!GRPC_ERROR_IS_NONE(error) || handshaker->is_shutdown_) {
     // If the write failed or we're shutting down, clean up and invoke the
     // callback with the error.
     handshaker->HandshakeFailedLocked(GRPC_ERROR_REF(error));
@@ -164,7 +178,7 @@ void HttpConnectHandshaker::OnWriteDone(void* arg, grpc_error_handle error) {
         GRPC_CLOSURE_INIT(&handshaker->response_read_closure_,
                           &HttpConnectHandshaker::OnReadDoneScheduler,
                           handshaker, grpc_schedule_on_exec_ctx),
-        /*urgent=*/true);
+        /*urgent=*/true, /*min_progress_size=*/1);
   }
 }
 
@@ -184,7 +198,7 @@ void HttpConnectHandshaker::OnReadDoneScheduler(void* arg,
 void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) {
   auto* handshaker = static_cast<HttpConnectHandshaker*>(arg);
   ReleasableMutexLock lock(&handshaker->mu_);
-  if (error != GRPC_ERROR_NONE || handshaker->is_shutdown_) {
+  if (!GRPC_ERROR_IS_NONE(error) || handshaker->is_shutdown_) {
     // If the read failed or we're shutting down, clean up and invoke the
     // callback with the error.
     handshaker->HandshakeFailedLocked(GRPC_ERROR_REF(error));
@@ -197,7 +211,7 @@ void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) {
       error = grpc_http_parser_parse(&handshaker->http_parser_,
                                      handshaker->args_->read_buffer->slices[i],
                                      &body_start_offset);
-      if (error != GRPC_ERROR_NONE) {
+      if (!GRPC_ERROR_IS_NONE(error)) {
         handshaker->HandshakeFailedLocked(error);
         goto done;
       }
@@ -240,7 +254,7 @@ void HttpConnectHandshaker::OnReadDone(void* arg, grpc_error_handle error) {
         GRPC_CLOSURE_INIT(&handshaker->response_read_closure_,
                           &HttpConnectHandshaker::OnReadDoneScheduler,
                           handshaker, grpc_schedule_on_exec_ctx),
-        /*urgent=*/true);
+        /*urgent=*/true, /*min_progress_size=*/1);
     return;
   }
   // Make sure we got a 2xx response.
@@ -354,7 +368,7 @@ void HttpConnectHandshaker::DoHandshake(grpc_tcp_server_acceptor* /*acceptor*/,
       GRPC_CLOSURE_INIT(&request_done_closure_,
                         &HttpConnectHandshaker::OnWriteDoneScheduler, this,
                         grpc_schedule_on_exec_ctx),
-      nullptr);
+      nullptr, /*max_frame_size=*/INT_MAX);
 }
 
 HttpConnectHandshaker::HttpConnectHandshaker() {

data/src/core/{ext/filters/client_channel → lib/transport}/http_connect_handshaker.h

@@ -16,8 +16,8 @@
  *
  */
 
-#ifndef GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H
-#define GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H
+#ifndef GRPC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H
+#define GRPC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H
 
 #include <grpc/support/port_platform.h>
 
@@ -39,4 +39,4 @@ void RegisterHttpConnectHandshaker(CoreConfiguration::Builder* builder);
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_EXT_FILTERS_CLIENT_CHANNEL_HTTP_CONNECT_HANDSHAKER_H */
+#endif /* GRPC_CORE_LIB_TRANSPORT_HTTP_CONNECT_HANDSHAKER_H */