Comments and format

2 files changed, 9 insertions, 3 deletions

diff --git a/include/grpc++/impl/codegen/server_context.h b/include/grpc++/impl/codegen/server_context.h
index 868b02882d..d3086aef0a 100644
--- a/include/grpc++/impl/codegen/server_context.h
+++ b/include/grpc++/impl/codegen/server_context.h
@@ -105,7 +105,15 @@ class ServerContext {
 
   bool IsCancelled() const;
 
-  // Best-effort API to cancel the call from the server.
+  // Cancel the Call from the server. This is a best-effort API and depending on
+  // when this is called, the Call may still appear successful to the client.
+  // For example, if called on a separate thread, it might race with the
+  // server handler which might return success to the client before TryCancel()
+  // was called.
+  //
+  // It is the caller's responsibility to prevent such races and ensure that the
+  // serverhandler returns Status::CANCELLED if TryCancel() is called (unless
+  // the serverhandler is already returning an error code)
   void TryCancel() const;
 
   const std::multimap<grpc::string_ref, grpc::string_ref>& client_metadata() {
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc
index 48838901d2..5fae056b63 100644
--- a/test/cpp/end2end/end2end_test.cc
+++ b/test/cpp/end2end/end2end_test.cc
@@ -797,8 +797,6 @@ TEST_P(End2endServerTryCancelTest, BidiStreamServerCancelAfter) {
   TestBidiStreamServerCancel(CANCEL_AFTER_PROCESSING, 5);
 }
 
-// =====
-
 TEST_P(End2endTest, RequestStreamOneRequest) {
   ResetStub();
   EchoRequest request;