Improve error message for concurrent modifications

Improve the error message logged when concurrent modifications occur and --experimental_guard_against_concurrent_changes is set. Closes bazelbuild#17174. PiperOrigin-RevId: 501012999 Change-Id: Id661ff2e5f98173323ebecb75b5e9825c8e0491e
joomcode · Jan 10, 2023 · 4977333 · 4977333
1 parent 36a640b
commit 4977333
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java b/src/main/java/com/google/devtools/build/lib/remote/RemoteSpawnCache.java
@@ -189,7 +189,11 @@ public void store(SpawnResult result) throws ExecException, InterruptedException
             try (SilentCloseable c = prof.profile("RemoteCache.checkForConcurrentModifications")) {
               checkForConcurrentModifications();
             } catch (IOException | ForbiddenActionInputException e) {
-              remoteExecutionService.report(Event.warn(e.getMessage()));
+              String msg =
+                  "Skipping uploading outputs because of concurrent modifications "
+                      + "with --experimental_guard_against_concurrent_changes enabled: "
+                      + e.getMessage();
+              remoteExecutionService.report(Event.warn(msg));
               return;
             }
           }