Catch StatusRuntimeException in the Cancel() RPC.

This avoids a server crash if the client gets killed before the server responds to the cancel message.

--
MOS_MIGRATED_REVID=133574767

1 files changed, 8 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
index 13837415f0..fd6f2670f2 100644
--- a/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
+++ b/src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java
@@ -767,8 +767,14 @@ public class GrpcServerImpl extends RPCServer {
               }
             }
 
-            streamObserver.onNext(CancelResponse.newBuilder().setCookie(responseCookie).build());
-            streamObserver.onCompleted();
+            try {
+              streamObserver.onNext(CancelResponse.newBuilder().setCookie(responseCookie).build());
+              streamObserver.onCompleted();
+            } catch (StatusRuntimeException e) {
+              // TThere is no one to report the failure to
+              log.info("Client cancelled RPC of cancellation request for "
+                  + request.getCommandId());
+            }
           }
         }
       };