Log "Worker configuration has changed, restarting worker pool..." regardless of the --worker_verbose setting.

This message is important because it can catch cases where people are unknowingly running consecutive builds with different options, leading to much slower builds. In this regard it is a lot like "Build options have changed, discarding analysis cache".

PiperOrigin-RevId: 201648554

1 files changed, 9 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java
index 4a2097d16d..2dce384801 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerModule.java
@@ -123,7 +123,9 @@ public class WorkerModule extends BlazeModule {
 
     // If the config changed compared to the last run, we have to create a new pool.
     if (workerPoolConfig != null && !workerPoolConfig.equals(newConfig)) {
-      shutdownPool("Worker configuration has changed, restarting worker pool...");
+      shutdownPool(
+          "Worker configuration has changed, restarting worker pool...",
+          /* alwaysLog= */ true);
     }
 
     if (workerPool == null) {
@@ -183,10 +185,15 @@ public class WorkerModule extends BlazeModule {
 
   /** Shuts down the worker pool and sets {#code workerPool} to null. */
   private void shutdownPool(String reason) {
+    shutdownPool(reason, /* alwaysLog= */ false);
+  }
+
+  /** Shuts down the worker pool and sets {#code workerPool} to null. */
+  private void shutdownPool(String reason, boolean alwaysLog) {
     Preconditions.checkArgument(!reason.isEmpty());
 
     if (workerPool != null) {
-      if (options != null && options.workerVerbose) {
+      if ((options != null && options.workerVerbose) || alwaysLog) {
         env.getReporter().handle(Event.info(reason));
       }
       workerPool.close();