From 39e0214b16a3c5f30e7bb5cd5b21f409eedad9f8 Mon Sep 17 00:00:00 2001 From: Tim Bain Date: Mon, 9 Jan 2023 18:53:45 +0000 Subject: [PATCH] Improve error message for concurrent modifications Improve the error message logged when concurrent modifications occur and --experimental_guard_against_concurrent_changes is set. --- .../google/devtools/build/lib/remote/RemoteSpawnCache.java | 4 +++- 1 file changed, 3 insertions(+), 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 index 8da2b2b0455411..153a68090b6628 100644 --- 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; } }