From 07590818d6ce0d0e66c2377db7e73fb6ee6702e5 Mon Sep 17 00:00:00 2001 From: Chi Wang Date: Tue, 7 Feb 2023 23:54:28 +0100 Subject: [PATCH] Improve error message for concurrent modifications (#17396) Improve the error message logged when concurrent modifications occur and --experimental_guard_against_concurrent_changes is set. Co-authored-by: Tim Bain Co-authored-by: kshyanashree <109167932+kshyanashree@users.noreply.github.com> --- .../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 09d821a0108e11..9d168d446736ef 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; } }