From 62fa36f259c5e1ce25a15e368196b1d1d3d4b950 Mon Sep 17 00:00:00 2001
From: larsrc <larsrc@google.com>
Date: Tue, 28 Jul 2020 03:11:50 -0700
Subject: [PATCH] Start worker count at 1 to distinguish no worker request id
 from worker request id 0. This prevents the multiplex-enabled workers from
 thinking they occasionally get non-multiplex requests and blocking on those.

RELNOTES: none
PiperOrigin-RevId: 323539794

---
don't include test changes to avoid conflict
---
 .../com/google/devtools/build/lib/worker/WorkerFactory.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java b/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
index ea07cffa8cbefc..0c37e6f9ec56cf 100644
--- a/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
+++ b/src/main/java/com/google/devtools/build/lib/worker/WorkerFactory.java
@@ -32,7 +32,9 @@ final class WorkerFactory extends BaseKeyedPooledObjectFactory<WorkerKey, Worker
   // It's fine to use an AtomicInteger here (which is 32-bit), because it is only incremented when
   // spawning a new worker, thus even under worst-case circumstances and buggy workers quitting
   // after each action, this should never overflow.
-  private static final AtomicInteger pidCounter = new AtomicInteger();
+  // This starts at 1 to avoid hiding latent problems of multiplex workers not returning a
+  // request_id (which is indistinguishable from 0 in proto3).
+  private static final AtomicInteger pidCounter = new AtomicInteger(1);
 
   private WorkerOptions workerOptions;
   private final Path workerBaseDir;