Merge pull request #16892 from ncteisen/channelz-fix

Assume UNKNOWN if No Status
7 years ago · 17048446cc
parent 191766c0f2 f1d3d32f9c
commit 17048446cc
1 changed files with 6 additions and 3 deletions
--- a/src/core/ext/filters/client_channel/subchannel.cc
+++ b/src/core/ext/filters/client_channel/subchannel.cc
@ -760,9 +760,12 @@ static void get_call_status(grpc_subchannel_call* call,
    grpc_error_get_status(error, call->deadline, status, nullptr, nullptr,
                          nullptr);
  } else {
-    GPR_ASSERT(md_batch->idx.named.grpc_status != nullptr);
-    *status =
-        grpc_get_status_code_from_metadata(md_batch->idx.named.grpc_status->md);
+    if (md_batch->idx.named.grpc_status != nullptr) {
+      *status = grpc_get_status_code_from_metadata(
+          md_batch->idx.named.grpc_status->md);
+    } else {
+      *status = GRPC_STATUS_UNKNOWN;
+    }
  }
  GRPC_ERROR_UNREF(error);
 }