commit b1d0aa6e7492af0966d6a705871c170573c835b7
author wilwell <wilwell@google.com> Fri Oct 08 05:57:06 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Oct 08 05:58:34 2021 -0700
tree dbb1a6317099ef16ec142019797bedf1123a212e
parent a7fca5220abf280d11c357903a09a5f5d408bb7f

Ignore pool error when worker is already not the part of the pool.

PiperOrigin-RevId: 401751715

src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
index 489df91..61a8b0f 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerSpawnRunner.java
@@ -542,7 +542,11 @@
                 }
               } finally {
                 if (w != null) {
-                  workers.returnObject(key, w);
+                  try {
+                    workers.returnObject(key, w);
+                  } catch (IllegalStateException e3) {
+                    // The worker already not part of the pool
+                  }
                 }
               }
             },