diff options
author | 2018-03-06 14:15:38 -0800 | |
---|---|---|
committer | 2018-03-06 14:17:33 -0800 | |
commit | e3cc481d5a0c53ad3574507ce43fdb6c9e71b30d (patch) | |
tree | 568095fa1a048ee4ce0a946d479bef9330e6c04d /src | |
parent | a03a9c3b76f3d43757f2dc3b9e262ed7ac671b15 (diff) |
Don't display remote exec failed message on interrupt. Fixes #4783
TESTED=manually
RELNOTES: None
PiperOrigin-RevId: 188079436
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnRunner.java | 5 |
1 files changed, 5 insertions, 0 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 0d113830b9..fc27127ec7 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 @@ -233,6 +233,11 @@ class RemoteSpawnRunner implements SpawnRunner { boolean uploadLocalResults, IOException cause) throws ExecException, InterruptedException, IOException { + // Regardless of cause, if we are interrupted, we should stop without displaying a user-visible + // failure/stack trace. + if (Thread.currentThread().isInterrupted()) { + throw new InterruptedException(); + } if (options.remoteLocalFallback && !(cause instanceof TimeoutException)) { return execLocally(spawn, policy, inputMap, uploadLocalResults, remoteCache, actionKey); } |