From 7b6e07db0cc31a1597bf06128542d66d8b611d86 Mon Sep 17 00:00:00 2001
From: "Mark D. Roth" <roth@google.com>
Date: Tue, 15 May 2018 11:19:37 -0700
Subject: [PATCH] Call on_handshake_done with an error when handshaker is shut
 down.

---
 src/core/lib/channel/handshaker.cc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/core/lib/channel/handshaker.cc b/src/core/lib/channel/handshaker.cc
index 2faeb64cb60..f0b1fe7369b 100644
--- a/src/core/lib/channel/handshaker.cc
+++ b/src/core/lib/channel/handshaker.cc
@@ -220,8 +220,14 @@ static bool call_next_handshaker_locked(grpc_handshake_manager* mgr,
   // callback.  Otherwise, call the next handshaker.
   if (error != GRPC_ERROR_NONE || mgr->shutdown || mgr->args.exit_early ||
       mgr->index == mgr->count) {
+    if (error == GRPC_ERROR_NONE && mgr->shutdown) {
+      error = GRPC_ERROR_CREATE_FROM_STATIC_STRING("handshaker shutdown");
+    }
     if (grpc_handshaker_trace.enabled()) {
-      gpr_log(GPR_INFO, "handshake_manager %p: handshaking complete", mgr);
+      gpr_log(GPR_INFO,
+              "handshake_manager %p: handshaking complete -- scheduling "
+              "on_handshake_done with error=%s",
+              mgr, grpc_error_string(error));
     }
     // Cancel deadline timer, since we're invoking the on_handshake_done
     // callback now.