commit 636430a30f3eef86062640d66e049df37ad16711
author mschaller <mschaller@google.com> Wed Feb 12 13:29:25 2020 -0800
committer Copybara-Service <copybara-worker@google.com> Wed Feb 12 13:30:23 2020 -0800
tree 90a1664c56bb540d6d6dbca654676f3b34627ebb
parent 2572bba43133692b249eb840d5262cb32bc020db

Prefix InterruptedCode's UNSPECIFIED with the enum name

It's a best practice because in C++ all protobuf enum values under a
message share one namespace.

RELNOTES: None.
PiperOrigin-RevId: 294742246

src/main/java/com/google/devtools/build/lib/server/GrpcServerImpl.java

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 e831e62..574d6e7 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
@@ -615,7 +615,7 @@
     } catch (InterruptedException e) {
       result =
           BlazeCommandResult.failureDetail(
-              FailureDetailUtil.interrupted(InterruptedCode.UNSPECIFIED));
+              FailureDetailUtil.interrupted(InterruptedCode.INTERRUPTED_UNSPECIFIED));
       commandId = ""; // The default value, the client will ignore it
     }
 

src/main/protobuf/failure_details.proto

diff --git a/src/main/protobuf/failure_details.proto b/src/main/protobuf/failure_details.proto
index 79adce5..4a35e07 100644
--- a/src/main/protobuf/failure_details.proto
+++ b/src/main/protobuf/failure_details.proto
@@ -94,7 +94,7 @@
 message Interrupted {
   enum InterruptedCode {
     // Interrupted at an unspecified time.
-    UNSPECIFIED = 0 [(metadata) = { exit_code: 8 }];
+    INTERRUPTED_UNSPECIFIED = 0 [(metadata) = { exit_code: 8 }];
     // TODO(mschaller): Add subcategories that specify what was happening at the
     //  time of interruption.
   }

src/test/java/com/google/devtools/build/lib/server/GrpcServerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/server/GrpcServerTest.java b/src/test/java/com/google/devtools/build/lib/server/GrpcServerTest.java
index 71d50f1..189b1f4 100644
--- a/src/test/java/com/google/devtools/build/lib/server/GrpcServerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/server/GrpcServerTest.java
@@ -400,7 +400,7 @@
     assertThat(secondResponse.get().hasFailureDetail()).isTrue();
     assertThat(secondResponse.get().getFailureDetail().hasInterrupted()).isTrue();
     assertThat(secondResponse.get().getFailureDetail().getInterrupted().getCode())
-        .isEqualTo(InterruptedCode.UNSPECIFIED);
+        .isEqualTo(InterruptedCode.INTERRUPTED_UNSPECIFIED);
   }
 
   @Test