commit 66e6c23372559a49e877f20059abed3336d30572
author yang-g <yangg@google.com> Wed Aug 30 15:51:53 2017 -0700
committer yang-g <yangg@google.com> Wed Aug 30 16:09:36 2017 -0700
tree da20028666a823807df58fd851388a94976c35f8
parent 8af54b8bfaa03d0012eed37077ac602a84b354a6

Log offending ops and error code before crashing the server

src/core/lib/surface/call.h

diff --git a/src/core/lib/surface/call.h b/src/core/lib/surface/call.h
index 185bfcc..b473e15 100644
--- a/src/core/lib/surface/call.h
+++ b/src/core/lib/surface/call.h
@@ -19,6 +19,10 @@
 #ifndef GRPC_CORE_LIB_SURFACE_CALL_H
 #define GRPC_CORE_LIB_SURFACE_CALL_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #include "src/core/lib/channel/channel_stack.h"
 #include "src/core/lib/channel/context.h"
 #include "src/core/lib/surface/api_trace.h"
@@ -26,10 +30,6 @@
 #include <grpc/grpc.h>
 #include <grpc/impl/codegen/compression_types.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 typedef void (*grpc_ioreq_completion_func)(grpc_exec_ctx *exec_ctx,
                                            grpc_call *call, int success,
                                            void *user_data);

src/cpp/server/server_cc.cc

diff --git a/src/cpp/server/server_cc.cc b/src/cpp/server/server_cc.cc
index 2483300..4532e43 100644
--- a/src/cpp/server/server_cc.cc
+++ b/src/cpp/server/server_cc.cc
@@ -17,6 +17,7 @@
 
 #include <grpc++/server.h>
 
+#include <cstdlib>
 #include <sstream>
 #include <utility>
 
@@ -38,11 +39,15 @@
 
 #include "src/core/ext/transport/inproc/inproc_transport.h"
 #include "src/core/lib/profiling/timers.h"
+#include "src/core/lib/surface/call.h"
 #include "src/cpp/client/create_channel_internal.h"
 #include "src/cpp/server/health/default_health_check_service.h"
 #include "src/cpp/thread_manager/thread_manager.h"
 
 namespace grpc {
+namespace {
+constexpr char this_file[] = __FILE__;
+}  // namespace
 
 class DefaultGlobalCallbacks final : public Server::GlobalCallbacks {
  public:
@@ -607,7 +612,12 @@
   grpc_op cops[MAX_OPS];
   ops->FillOps(call->call(), cops, &nops);
   auto result = grpc_call_start_batch(call->call(), cops, nops, ops, nullptr);
-  GPR_ASSERT(GRPC_CALL_OK == result);
+  if (result != GRPC_CALL_OK) {
+    gpr_log(GPR_ERROR, "Fatal: grpc_call_start_batch returned %d", result);
+    grpc_call_log_batch(const_cast<char*>(this_file), __LINE__,
+                        GPR_LOG_SEVERITY_ERROR, call->call(), cops, nops, ops);
+    abort();
+  }
 }
 
 ServerInterface::BaseAsyncRequest::BaseAsyncRequest(