Friendlier error messages on remote failures. Moving the error to the top. Removing stack trace unless verbose failures is on.

TESTED=unit test
PiperOrigin-RevId: 194060440

2 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
index df20b4220d..9034e40c2e 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java
@@ -308,7 +308,7 @@ class RemoteSpawnRunner implements SpawnRunner {
       status = Status.EXECUTION_FAILED;
     }
     throw new SpawnExecException(
-        Throwables.getStackTraceAsString(exception),
+        verboseFailures ? Throwables.getStackTraceAsString(exception) : exception.getMessage(),
         new SpawnResult.Builder()
             .setRunnerName(getName())
             .setStatus(status)
diff --git a/src/main/java/com/google/devtools/build/lib/remote/Retrier.java b/src/main/java/com/google/devtools/build/lib/remote/Retrier.java
index b675e51e67..770098cc5f 100644
--- a/src/main/java/com/google/devtools/build/lib/remote/Retrier.java
+++ b/src/main/java/com/google/devtools/build/lib/remote/Retrier.java
@@ -235,12 +235,12 @@ class Retrier {
         }
         int attempts = backoff.getRetryAttempts();
         if (!shouldRetry.test(e)) {
-          throw new RetryException("Call failed with not retriable error.", attempts, e);
+          throw new RetryException("Call failed with not retriable error: " + e, attempts, e);
         }
         final long delayMillis = backoff.nextDelayMillis();
         if (delayMillis < 0) {
           throw new RetryException(
-              "Call failed after exhausting retry attempts: " + attempts, attempts, e);
+              "Call failed after " + attempts + " retry attempts: " + e, attempts, e);
         }
         sleeper.sleep(delayMillis);
       }