grpc 1.45.0 → 1.46.2

data/src/core/ext/filters/client_channel/health/health_check_client.cc

@@ -1,20 +1,18 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -28,593 +26,138 @@
 #include <grpc/status.h>
 
 #include "src/core/lib/debug/trace.h"
-#include "src/core/lib/gprpp/sync.h"
-#include "src/core/lib/resource_quota/api.h"
 #include "src/core/lib/slice/slice_internal.h"
-#include "src/core/lib/transport/error_utils.h"
 #include "src/proto/grpc/health/v1/health.upb.h"
 
-#define HEALTH_CHECK_INITIAL_CONNECT_BACKOFF_SECONDS 1
-#define HEALTH_CHECK_RECONNECT_BACKOFF_MULTIPLIER 1.6
-#define HEALTH_CHECK_RECONNECT_MAX_BACKOFF_SECONDS 120
-#define HEALTH_CHECK_RECONNECT_JITTER 0.2
-
 namespace grpc_core {
 
 TraceFlag grpc_health_check_client_trace(false, "health_check_client");
 
-//
-// HealthCheckClient
-//
-
-HealthCheckClient::HealthCheckClient(
-    std::string service_name,
-    RefCountedPtr<ConnectedSubchannel> connected_subchannel,
-    grpc_pollset_set* interested_parties,
-    RefCountedPtr<channelz::SubchannelNode> channelz_node,
-    RefCountedPtr<ConnectivityStateWatcherInterface> watcher)
-    : InternallyRefCounted<HealthCheckClient>(
-          GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)
-              ? "HealthCheckClient"
-              : nullptr),
-      service_name_(std::move(service_name)),
-      connected_subchannel_(std::move(connected_subchannel)),
-      interested_parties_(interested_parties),
-      channelz_node_(std::move(channelz_node)),
-      call_allocator_(
-          ResourceQuotaFromChannelArgs(connected_subchannel_->args())
-              ->memory_quota()
-              ->CreateMemoryAllocator(service_name_)),
-      watcher_(std::move(watcher)),
-      retry_backoff_(
-          BackOff::Options()
-              .set_initial_backoff(Duration::Seconds(
-                  HEALTH_CHECK_INITIAL_CONNECT_BACKOFF_SECONDS))
-              .set_multiplier(HEALTH_CHECK_RECONNECT_BACKOFF_MULTIPLIER)
-              .set_jitter(HEALTH_CHECK_RECONNECT_JITTER)
-              .set_max_backoff(Duration::Seconds(
-                  HEALTH_CHECK_RECONNECT_MAX_BACKOFF_SECONDS))) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO, "created HealthCheckClient %p", this);
-  }
-  GRPC_CLOSURE_INIT(&retry_timer_callback_, OnRetryTimer, this,
-                    grpc_schedule_on_exec_ctx);
-  StartCall();
-}
-
-HealthCheckClient::~HealthCheckClient() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO, "destroying HealthCheckClient %p", this);
-  }
-}
-
-void HealthCheckClient::SetHealthStatus(grpc_connectivity_state state,
-                                        const char* reason) {
-  MutexLock lock(&mu_);
-  SetHealthStatusLocked(state, reason);
-}
-
-void HealthCheckClient::SetHealthStatusLocked(grpc_connectivity_state state,
-                                              const char* reason) {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO, "HealthCheckClient %p: setting state=%s reason=%s", this,
-            ConnectivityStateName(state), reason);
-  }
-  if (watcher_ != nullptr) {
-    watcher_->Notify(state,
-                     state == GRPC_CHANNEL_TRANSIENT_FAILURE
-                         ? absl::Status(absl::StatusCode::kUnavailable, reason)
-                         : absl::Status());
-  }
-}
+namespace {
 
-void HealthCheckClient::Orphan() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO, "HealthCheckClient %p: shutting down", this);
-  }
-  {
-    MutexLock lock(&mu_);
-    shutting_down_ = true;
-    watcher_.reset();
-    call_state_.reset();
-    if (retry_timer_callback_pending_) {
-      grpc_timer_cancel(&retry_timer_);
+class HealthStreamEventHandler
+    : public SubchannelStreamClient::CallEventHandler {
+ public:
+  HealthStreamEventHandler(
+      std::string service_name,
+      RefCountedPtr<channelz::SubchannelNode> channelz_node,
+      RefCountedPtr<ConnectivityStateWatcherInterface> watcher)
+      : service_name_(std::move(service_name)),
+        channelz_node_(std::move(channelz_node)),
+        watcher_(std::move(watcher)) {}
+
+  Slice GetPathLocked() override {
+    return Slice::FromStaticString("/grpc.health.v1.Health/Watch");
+  }
+
+  void OnCallStartLocked(SubchannelStreamClient* client) override {
+    SetHealthStatusLocked(client, GRPC_CHANNEL_CONNECTING,
+                          "starting health watch");
+  }
+
+  void OnRetryTimerStartLocked(SubchannelStreamClient* client) override {
+    SetHealthStatusLocked(client, GRPC_CHANNEL_TRANSIENT_FAILURE,
+                          "health check call failed; will retry after backoff");
+  }
+
+  grpc_slice EncodeSendMessageLocked() override {
+    upb::Arena arena;
+    grpc_health_v1_HealthCheckRequest* request_struct =
+        grpc_health_v1_HealthCheckRequest_new(arena.ptr());
+    grpc_health_v1_HealthCheckRequest_set_service(
+        request_struct, upb_StringView_FromDataAndSize(service_name_.data(),
+                                                       service_name_.size()));
+    size_t buf_length;
+    char* buf = grpc_health_v1_HealthCheckRequest_serialize(
+        request_struct, arena.ptr(), &buf_length);
+    grpc_slice request_slice = GRPC_SLICE_MALLOC(buf_length);
+    memcpy(GRPC_SLICE_START_PTR(request_slice), buf, buf_length);
+    return request_slice;
+  }
+
+  absl::Status RecvMessageReadyLocked(
+      SubchannelStreamClient* client,
+      absl::string_view serialized_message) override {
+    auto healthy = DecodeResponse(serialized_message);
+    if (!healthy.ok()) {
+      SetHealthStatusLocked(client, GRPC_CHANNEL_TRANSIENT_FAILURE,
+                            healthy.status().ToString().c_str());
+      return healthy.status();
     }
-  }
-  Unref(DEBUG_LOCATION, "orphan");
-}
-
-void HealthCheckClient::StartCall() {
-  MutexLock lock(&mu_);
-  StartCallLocked();
-}
-
-void HealthCheckClient::StartCallLocked() {
-  if (shutting_down_) return;
-  GPR_ASSERT(call_state_ == nullptr);
-  SetHealthStatusLocked(GRPC_CHANNEL_CONNECTING, "starting health watch");
-  call_state_ = MakeOrphanable<CallState>(Ref(), interested_parties_);
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO, "HealthCheckClient %p: created CallState %p", this,
-            call_state_.get());
-  }
-  call_state_->StartCall();
-}
-
-void HealthCheckClient::StartRetryTimerLocked() {
-  SetHealthStatusLocked(GRPC_CHANNEL_TRANSIENT_FAILURE,
-                        "health check call failed; will retry after backoff");
-  Timestamp next_try = retry_backoff_.NextAttemptTime();
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO, "HealthCheckClient %p: health check call lost...", this);
-    Duration timeout = next_try - ExecCtx::Get()->Now();
-    if (timeout > Duration::Zero()) {
-      gpr_log(GPR_INFO,
-              "HealthCheckClient %p: ... will retry in %" PRId64 "ms.", this,
-              timeout.millis());
+    if (!*healthy) {
+      SetHealthStatusLocked(client, GRPC_CHANNEL_TRANSIENT_FAILURE,
+                            "backend unhealthy");
     } else {
-      gpr_log(GPR_INFO, "HealthCheckClient %p: ... retrying immediately.",
-              this);
+      SetHealthStatusLocked(client, GRPC_CHANNEL_READY, "OK");
     }
-  }
-  // Ref for callback, tracked manually.
-  Ref(DEBUG_LOCATION, "health_retry_timer").release();
-  retry_timer_callback_pending_ = true;
-  grpc_timer_init(&retry_timer_, next_try, &retry_timer_callback_);
-}
-
-void HealthCheckClient::OnRetryTimer(void* arg, grpc_error_handle error) {
-  HealthCheckClient* self = static_cast<HealthCheckClient*>(arg);
-  {
-    MutexLock lock(&self->mu_);
-    self->retry_timer_callback_pending_ = false;
-    if (!self->shutting_down_ && error == GRPC_ERROR_NONE &&
-        self->call_state_ == nullptr) {
-      if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-        gpr_log(GPR_INFO, "HealthCheckClient %p: restarting health check call",
-                self);
+    return absl::OkStatus();
+  }
+
+  void RecvTrailingMetadataReadyLocked(SubchannelStreamClient* client,
+                                       grpc_status_code status) override {
+    if (status == GRPC_STATUS_UNIMPLEMENTED) {
+      static const char kErrorMessage[] =
+          "health checking Watch method returned UNIMPLEMENTED; "
+          "disabling health checks but assuming server is healthy";
+      gpr_log(GPR_ERROR, kErrorMessage);
+      if (channelz_node_ != nullptr) {
+        channelz_node_->AddTraceEvent(
+            channelz::ChannelTrace::Error,
+            grpc_slice_from_static_string(kErrorMessage));
       }
-      self->StartCallLocked();
+      SetHealthStatusLocked(client, GRPC_CHANNEL_READY, kErrorMessage);
     }
   }
-  self->Unref(DEBUG_LOCATION, "health_retry_timer");
-}
 
-//
-// protobuf helpers
-//
-
-namespace {
-
-void EncodeRequest(const std::string& service_name,
-                   ManualConstructor<SliceBufferByteStream>* send_message) {
-  upb::Arena arena;
-  grpc_health_v1_HealthCheckRequest* request_struct =
-      grpc_health_v1_HealthCheckRequest_new(arena.ptr());
-  grpc_health_v1_HealthCheckRequest_set_service(
-      request_struct,
-      upb_StringView_FromDataAndSize(service_name.data(), service_name.size()));
-  size_t buf_length;
-  char* buf = grpc_health_v1_HealthCheckRequest_serialize(
-      request_struct, arena.ptr(), &buf_length);
-  grpc_slice request_slice = GRPC_SLICE_MALLOC(buf_length);
-  memcpy(GRPC_SLICE_START_PTR(request_slice), buf, buf_length);
-  grpc_slice_buffer slice_buffer;
-  grpc_slice_buffer_init(&slice_buffer);
-  grpc_slice_buffer_add(&slice_buffer, request_slice);
-  send_message->Init(&slice_buffer, 0);
-  grpc_slice_buffer_destroy_internal(&slice_buffer);
-}
-
-// Returns true if healthy.
-// If there was an error parsing the response, sets *error and returns false.
-bool DecodeResponse(grpc_slice_buffer* slice_buffer, grpc_error_handle* error) {
-  // If message is empty, assume unhealthy.
-  if (slice_buffer->length == 0) {
-    *error =
-        GRPC_ERROR_CREATE_FROM_STATIC_STRING("health check response was empty");
-    return false;
-  }
-  // Concatenate the slices to form a single string.
-  std::unique_ptr<uint8_t> recv_message_deleter;
-  uint8_t* recv_message;
-  if (slice_buffer->count == 1) {
-    recv_message = GRPC_SLICE_START_PTR(slice_buffer->slices[0]);
-  } else {
-    recv_message = static_cast<uint8_t*>(gpr_malloc(slice_buffer->length));
-    recv_message_deleter.reset(recv_message);
-    size_t offset = 0;
-    for (size_t i = 0; i < slice_buffer->count; ++i) {
-      memcpy(recv_message + offset,
-             GRPC_SLICE_START_PTR(slice_buffer->slices[i]),
-             GRPC_SLICE_LENGTH(slice_buffer->slices[i]));
-      offset += GRPC_SLICE_LENGTH(slice_buffer->slices[i]);
+ private:
+  // Returns true if healthy.
+  static absl::StatusOr<bool> DecodeResponse(
+      absl::string_view serialized_message) {
+    // Deserialize message.
+    upb::Arena arena;
+    auto* response = grpc_health_v1_HealthCheckResponse_parse(
+        serialized_message.data(), serialized_message.size(), arena.ptr());
+    if (response == nullptr) {
+      // Can't parse message; assume unhealthy.
+      return absl::InvalidArgumentError("cannot parse health check response");
     }
+    int32_t status = grpc_health_v1_HealthCheckResponse_status(response);
+    return status == grpc_health_v1_HealthCheckResponse_SERVING;
   }
-  // Deserialize message.
-  upb::Arena arena;
-  grpc_health_v1_HealthCheckResponse* response_struct =
-      grpc_health_v1_HealthCheckResponse_parse(
-          reinterpret_cast<char*>(recv_message), slice_buffer->length,
-          arena.ptr());
-  if (response_struct == nullptr) {
-    // Can't parse message; assume unhealthy.
-    *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
-        "cannot parse health check response");
-    return false;
-  }
-  int32_t status = grpc_health_v1_HealthCheckResponse_status(response_struct);
-  return status == grpc_health_v1_HealthCheckResponse_SERVING;
-}
 
-}  // namespace
-
-//
-// HealthCheckClient::CallState
-//
-
-HealthCheckClient::CallState::CallState(
-    RefCountedPtr<HealthCheckClient> health_check_client,
-    grpc_pollset_set* interested_parties)
-    : health_check_client_(std::move(health_check_client)),
-      pollent_(grpc_polling_entity_create_from_pollset_set(interested_parties)),
-      arena_(Arena::Create(health_check_client_->connected_subchannel_
-                               ->GetInitialCallSizeEstimate(),
-                           &health_check_client_->call_allocator_)),
-      payload_(context_),
-      send_initial_metadata_(arena_.get()),
-      send_trailing_metadata_(arena_.get()),
-      recv_initial_metadata_(arena_.get()),
-      recv_trailing_metadata_(arena_.get()) {}
-
-HealthCheckClient::CallState::~CallState() {
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO, "HealthCheckClient %p: destroying CallState %p",
-            health_check_client_.get(), this);
-  }
-  for (size_t i = 0; i < GRPC_CONTEXT_COUNT; i++) {
-    if (context_[i].destroy != nullptr) {
-      context_[i].destroy(context_[i].value);
+  void SetHealthStatusLocked(SubchannelStreamClient* client,
+                             grpc_connectivity_state state,
+                             const char* reason) {
+    if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
+      gpr_log(GPR_INFO, "HealthCheckClient %p: setting state=%s reason=%s",
+              client, ConnectivityStateName(state), reason);
     }
+    watcher_->Notify(state, state == GRPC_CHANNEL_TRANSIENT_FAILURE
+                                ? absl::UnavailableError(reason)
+                                : absl::Status());
   }
-  // Unset the call combiner cancellation closure.  This has the
-  // effect of scheduling the previously set cancellation closure, if
-  // any, so that it can release any internal references it may be
-  // holding to the call stack.
-  call_combiner_.SetNotifyOnCancel(nullptr);
-}
-
-void HealthCheckClient::CallState::Orphan() {
-  call_combiner_.Cancel(GRPC_ERROR_CANCELLED);
-  Cancel();
-}
-
-void HealthCheckClient::CallState::StartCall() {
-  SubchannelCall::Args args = {
-      health_check_client_->connected_subchannel_,
-      &pollent_,
-      Slice::FromStaticString("/grpc.health.v1.Health/Watch"),
-      gpr_get_cycle_counter(),  // start_time
-      Timestamp::InfFuture(),   // deadline
-      arena_.get(),
-      context_,
-      &call_combiner_,
-  };
-  grpc_error_handle error = GRPC_ERROR_NONE;
-  call_ = SubchannelCall::Create(std::move(args), &error).release();
-  // Register after-destruction callback.
-  GRPC_CLOSURE_INIT(&after_call_stack_destruction_, AfterCallStackDestruction,
-                    this, grpc_schedule_on_exec_ctx);
-  call_->SetAfterCallStackDestroy(&after_call_stack_destruction_);
-  // Check if creation failed.
-  if (error != GRPC_ERROR_NONE) {
-    gpr_log(GPR_ERROR,
-            "HealthCheckClient %p CallState %p: error creating health "
-            "checking call on subchannel (%s); will retry",
-            health_check_client_.get(), this,
-            grpc_error_std_string(error).c_str());
-    GRPC_ERROR_UNREF(error);
-    CallEndedLocked(/*retry=*/true);
-    return;
-  }
-  // Initialize payload and batch.
-  payload_.context = context_;
-  batch_.payload = &payload_;
-  // on_complete callback takes ref, handled manually.
-  call_->Ref(DEBUG_LOCATION, "on_complete").release();
-  batch_.on_complete = GRPC_CLOSURE_INIT(&on_complete_, OnComplete, this,
-                                         grpc_schedule_on_exec_ctx);
-  // Add send_initial_metadata op.
-  send_initial_metadata_.Set(
-      HttpPathMetadata(),
-      Slice::FromStaticString("/grpc.health.v1.Health/Watch"));
-  GPR_ASSERT(error == GRPC_ERROR_NONE);
-  payload_.send_initial_metadata.send_initial_metadata =
-      &send_initial_metadata_;
-  payload_.send_initial_metadata.send_initial_metadata_flags = 0;
-  payload_.send_initial_metadata.peer_string = nullptr;
-  batch_.send_initial_metadata = true;
-  // Add send_message op.
-  EncodeRequest(health_check_client_->service_name_, &send_message_);
-  payload_.send_message.send_message.reset(send_message_.get());
-  batch_.send_message = true;
-  // Add send_trailing_metadata op.
-  payload_.send_trailing_metadata.send_trailing_metadata =
-      &send_trailing_metadata_;
-  batch_.send_trailing_metadata = true;
-  // Add recv_initial_metadata op.
-  payload_.recv_initial_metadata.recv_initial_metadata =
-      &recv_initial_metadata_;
-  payload_.recv_initial_metadata.recv_flags = nullptr;
-  payload_.recv_initial_metadata.trailing_metadata_available = nullptr;
-  payload_.recv_initial_metadata.peer_string = nullptr;
-  // recv_initial_metadata_ready callback takes ref, handled manually.
-  call_->Ref(DEBUG_LOCATION, "recv_initial_metadata_ready").release();
-  payload_.recv_initial_metadata.recv_initial_metadata_ready =
-      GRPC_CLOSURE_INIT(&recv_initial_metadata_ready_, RecvInitialMetadataReady,
-                        this, grpc_schedule_on_exec_ctx);
-  batch_.recv_initial_metadata = true;
-  // Add recv_message op.
-  payload_.recv_message.recv_message = &recv_message_;
-  payload_.recv_message.call_failed_before_recv_message = nullptr;
-  // recv_message callback takes ref, handled manually.
-  call_->Ref(DEBUG_LOCATION, "recv_message_ready").release();
-  payload_.recv_message.recv_message_ready = GRPC_CLOSURE_INIT(
-      &recv_message_ready_, RecvMessageReady, this, grpc_schedule_on_exec_ctx);
-  batch_.recv_message = true;
-  // Start batch.
-  StartBatch(&batch_);
-  // Initialize recv_trailing_metadata batch.
-  recv_trailing_metadata_batch_.payload = &payload_;
-  // Add recv_trailing_metadata op.
-  payload_.recv_trailing_metadata.recv_trailing_metadata =
-      &recv_trailing_metadata_;
-  payload_.recv_trailing_metadata.collect_stats = &collect_stats_;
-  // This callback signals the end of the call, so it relies on the
-  // initial ref instead of taking a new ref.  When it's invoked, the
-  // initial ref is released.
-  payload_.recv_trailing_metadata.recv_trailing_metadata_ready =
-      GRPC_CLOSURE_INIT(&recv_trailing_metadata_ready_,
-                        RecvTrailingMetadataReady, this,
-                        grpc_schedule_on_exec_ctx);
-  recv_trailing_metadata_batch_.recv_trailing_metadata = true;
-  // Start recv_trailing_metadata batch.
-  StartBatch(&recv_trailing_metadata_batch_);
-}
-
-void HealthCheckClient::CallState::StartBatchInCallCombiner(
-    void* arg, grpc_error_handle /*error*/) {
-  grpc_transport_stream_op_batch* batch =
-      static_cast<grpc_transport_stream_op_batch*>(arg);
-  SubchannelCall* call =
-      static_cast<SubchannelCall*>(batch->handler_private.extra_arg);
-  call->StartTransportStreamOpBatch(batch);
-}
-
-void HealthCheckClient::CallState::StartBatch(
-    grpc_transport_stream_op_batch* batch) {
-  batch->handler_private.extra_arg = call_;
-  GRPC_CLOSURE_INIT(&batch->handler_private.closure, StartBatchInCallCombiner,
-                    batch, grpc_schedule_on_exec_ctx);
-  GRPC_CALL_COMBINER_START(&call_combiner_, &batch->handler_private.closure,
-                           GRPC_ERROR_NONE, "start_subchannel_batch");
-}
-
-void HealthCheckClient::CallState::AfterCallStackDestruction(
-    void* arg, grpc_error_handle /*error*/) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  delete self;
-}
-
-void HealthCheckClient::CallState::OnCancelComplete(
-    void* arg, grpc_error_handle /*error*/) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "health_cancel");
-  self->call_->Unref(DEBUG_LOCATION, "cancel");
-}
-
-void HealthCheckClient::CallState::StartCancel(void* arg,
-                                               grpc_error_handle /*error*/) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  auto* batch = grpc_make_transport_stream_op(
-      GRPC_CLOSURE_CREATE(OnCancelComplete, self, grpc_schedule_on_exec_ctx));
-  batch->cancel_stream = true;
-  batch->payload->cancel_stream.cancel_error = GRPC_ERROR_CANCELLED;
-  self->call_->StartTransportStreamOpBatch(batch);
-}
-
-void HealthCheckClient::CallState::Cancel() {
-  bool expected = false;
-  if (cancelled_.compare_exchange_strong(expected, true,
-                                         std::memory_order_acq_rel,
-                                         std::memory_order_acquire)) {
-    call_->Ref(DEBUG_LOCATION, "cancel").release();
-    GRPC_CALL_COMBINER_START(
-        &call_combiner_,
-        GRPC_CLOSURE_CREATE(StartCancel, this, grpc_schedule_on_exec_ctx),
-        GRPC_ERROR_NONE, "health_cancel");
-  }
-}
-
-void HealthCheckClient::CallState::OnComplete(void* arg,
-                                              grpc_error_handle /*error*/) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "on_complete");
-  self->send_initial_metadata_.Clear();
-  self->send_trailing_metadata_.Clear();
-  self->call_->Unref(DEBUG_LOCATION, "on_complete");
-}
-
-void HealthCheckClient::CallState::RecvInitialMetadataReady(
-    void* arg, grpc_error_handle /*error*/) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "recv_initial_metadata_ready");
-  self->recv_initial_metadata_.Clear();
-  self->call_->Unref(DEBUG_LOCATION, "recv_initial_metadata_ready");
-}
-
-void HealthCheckClient::CallState::DoneReadingRecvMessage(
-    grpc_error_handle error) {
-  recv_message_.reset();
-  if (error != GRPC_ERROR_NONE) {
-    GRPC_ERROR_UNREF(error);
-    Cancel();
-    grpc_slice_buffer_destroy_internal(&recv_message_buffer_);
-    call_->Unref(DEBUG_LOCATION, "recv_message_ready");
-    return;
-  }
-  const bool healthy = DecodeResponse(&recv_message_buffer_, &error);
-  const grpc_connectivity_state state =
-      healthy ? GRPC_CHANNEL_READY : GRPC_CHANNEL_TRANSIENT_FAILURE;
-  health_check_client_->SetHealthStatus(
-      state, error == GRPC_ERROR_NONE && !healthy
-                 ? "backend unhealthy"
-                 : grpc_error_std_string(error).c_str());
-  seen_response_.store(true, std::memory_order_release);
-  grpc_slice_buffer_destroy_internal(&recv_message_buffer_);
-  // Start another recv_message batch.
-  // This re-uses the ref we're holding.
-  // Note: Can't just reuse batch_ here, since we don't know that all
-  // callbacks from the original batch have completed yet.
-  recv_message_batch_.payload = &payload_;
-  payload_.recv_message.recv_message = &recv_message_;
-  payload_.recv_message.call_failed_before_recv_message = nullptr;
-  payload_.recv_message.recv_message_ready = GRPC_CLOSURE_INIT(
-      &recv_message_ready_, RecvMessageReady, this, grpc_schedule_on_exec_ctx);
-  recv_message_batch_.recv_message = true;
-  StartBatch(&recv_message_batch_);
-}
-
-grpc_error_handle HealthCheckClient::CallState::PullSliceFromRecvMessage() {
-  grpc_slice slice;
-  grpc_error_handle error = recv_message_->Pull(&slice);
-  if (error == GRPC_ERROR_NONE) {
-    grpc_slice_buffer_add(&recv_message_buffer_, slice);
-  }
-  return error;
-}
-
-void HealthCheckClient::CallState::ContinueReadingRecvMessage() {
-  while (recv_message_->Next(SIZE_MAX, &recv_message_ready_)) {
-    grpc_error_handle error = PullSliceFromRecvMessage();
-    if (error != GRPC_ERROR_NONE) {
-      DoneReadingRecvMessage(error);
-      return;
-    }
-    if (recv_message_buffer_.length == recv_message_->length()) {
-      DoneReadingRecvMessage(GRPC_ERROR_NONE);
-      break;
-    }
-  }
-}
 
-void HealthCheckClient::CallState::OnByteStreamNext(void* arg,
-                                                    grpc_error_handle error) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  if (error != GRPC_ERROR_NONE) {
-    self->DoneReadingRecvMessage(GRPC_ERROR_REF(error));
-    return;
-  }
-  error = self->PullSliceFromRecvMessage();
-  if (error != GRPC_ERROR_NONE) {
-    self->DoneReadingRecvMessage(error);
-    return;
-  }
-  if (self->recv_message_buffer_.length == self->recv_message_->length()) {
-    self->DoneReadingRecvMessage(GRPC_ERROR_NONE);
-  } else {
-    self->ContinueReadingRecvMessage();
-  }
-}
-
-void HealthCheckClient::CallState::RecvMessageReady(
-    void* arg, grpc_error_handle /*error*/) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  GRPC_CALL_COMBINER_STOP(&self->call_combiner_, "recv_message_ready");
-  if (self->recv_message_ == nullptr) {
-    self->call_->Unref(DEBUG_LOCATION, "recv_message_ready");
-    return;
-  }
-  grpc_slice_buffer_init(&self->recv_message_buffer_);
-  GRPC_CLOSURE_INIT(&self->recv_message_ready_, OnByteStreamNext, self,
-                    grpc_schedule_on_exec_ctx);
-  self->ContinueReadingRecvMessage();
-  // Ref will continue to be held until we finish draining the byte stream.
-}
+  std::string service_name_;
+  RefCountedPtr<channelz::SubchannelNode> channelz_node_;
+  RefCountedPtr<ConnectivityStateWatcherInterface> watcher_;
+};
 
-void HealthCheckClient::CallState::RecvTrailingMetadataReady(
-    void* arg, grpc_error_handle error) {
-  HealthCheckClient::CallState* self =
-      static_cast<HealthCheckClient::CallState*>(arg);
-  GRPC_CALL_COMBINER_STOP(&self->call_combiner_,
-                          "recv_trailing_metadata_ready");
-  // Get call status.
-  grpc_status_code status =
-      self->recv_trailing_metadata_.get(GrpcStatusMetadata())
-          .value_or(GRPC_STATUS_UNKNOWN);
-  if (error != GRPC_ERROR_NONE) {
-    grpc_error_get_status(error, Timestamp::InfFuture(), &status,
-                          nullptr /* slice */, nullptr /* http_error */,
-                          nullptr /* error_string */);
-  }
-  if (GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)) {
-    gpr_log(GPR_INFO,
-            "HealthCheckClient %p CallState %p: health watch failed with "
-            "status %d",
-            self->health_check_client_.get(), self, status);
-  }
-  // Clean up.
-  self->recv_trailing_metadata_.Clear();
-  // For status UNIMPLEMENTED, give up and assume always healthy.
-  bool retry = true;
-  if (status == GRPC_STATUS_UNIMPLEMENTED) {
-    static const char kErrorMessage[] =
-        "health checking Watch method returned UNIMPLEMENTED; "
-        "disabling health checks but assuming server is healthy";
-    gpr_log(GPR_ERROR, kErrorMessage);
-    if (self->health_check_client_->channelz_node_ != nullptr) {
-      self->health_check_client_->channelz_node_->AddTraceEvent(
-          channelz::ChannelTrace::Error,
-          grpc_slice_from_static_string(kErrorMessage));
-    }
-    self->health_check_client_->SetHealthStatus(GRPC_CHANNEL_READY,
-                                                kErrorMessage);
-    retry = false;
-  }
-  MutexLock lock(&self->health_check_client_->mu_);
-  self->CallEndedLocked(retry);
-}
+}  // namespace
 
-void HealthCheckClient::CallState::CallEndedLocked(bool retry) {
-  // If this CallState is still in use, this call ended because of a failure,
-  // so we need to stop using it and optionally create a new one.
-  // Otherwise, we have deliberately ended this call, and no further action
-  // is required.
-  if (this == health_check_client_->call_state_.get()) {
-    health_check_client_->call_state_.reset();
-    if (retry) {
-      GPR_ASSERT(!health_check_client_->shutting_down_);
-      if (seen_response_.load(std::memory_order_acquire)) {
-        // If the call fails after we've gotten a successful response, reset
-        // the backoff and restart the call immediately.
-        health_check_client_->retry_backoff_.Reset();
-        health_check_client_->StartCallLocked();
-      } else {
-        // If the call failed without receiving any messages, retry later.
-        health_check_client_->StartRetryTimerLocked();
-      }
-    }
-  }
-  // When the last ref to the call stack goes away, the CallState object
-  // will be automatically destroyed.
-  call_->Unref(DEBUG_LOCATION, "call_ended");
+OrphanablePtr<SubchannelStreamClient> MakeHealthCheckClient(
+    std::string service_name,
+    RefCountedPtr<ConnectedSubchannel> connected_subchannel,
+    grpc_pollset_set* interested_parties,
+    RefCountedPtr<channelz::SubchannelNode> channelz_node,
+    RefCountedPtr<ConnectivityStateWatcherInterface> watcher) {
+  return MakeOrphanable<SubchannelStreamClient>(
+      std::move(connected_subchannel), interested_parties,
+      absl::make_unique<HealthStreamEventHandler>(std::move(service_name),
+                                                  std::move(channelz_node),
+                                                  std::move(watcher)),
+      GRPC_TRACE_FLAG_ENABLED(grpc_health_check_client_trace)
+          ? "HealthCheckClient"
+          : nullptr);
 }
 
 }  // namespace grpc_core