Improve error message for concurrent modifications (bazelbuild#17396)

coeuvre · tbaing · ShreeM01 · web-flow · commit 07590818d6ce · 2023-02-07T22:54:28.000Z
Improve the error message logged when concurrent modifications
occur and --experimental_guard_against_concurrent_changes is set.

Co-authored-by: Tim Bain &lt;tbain@google.com&gt;
Co-authored-by: kshyanashree &lt;109167932+kshyanashree@users.noreply.github.com&gt;
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,9 @@ 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;
             }
           }

Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,9 @@ public void store(SpawnResult result) throws ExecException, InterruptedException`
`189`	`189`	`try (SilentCloseable c = prof.profile("RemoteCache.checkForConcurrentModifications")) {`
`190`	`190`	`checkForConcurrentModifications();`
`191`	`191`	`} catch (IOException \| ForbiddenActionInputException e) {`
`192`		`- remoteExecutionService.report(Event.warn(e.getMessage()));`
	`192`	`+ String msg = "Skipping uploading outputs because of concurrent modifications " +`
	`193`	`+ "with --experimental_guard_against_concurrent_changes enabled: " + e.getMessage();`
	`194`	`+ remoteExecutionService.report(Event.warn(msg));`
`193`	`195`	`return;`
`194`	`196`	`}`
`195`	`197`	`}`