From c6c33b98506abec9fbe520ff011f884ec98c3bde Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 19 Apr 2023 05:14:35 -0700 Subject: [PATCH] Show in UI that worker is multiplexed only if multiplex workers are enabled. Before we checked only that this action supports multiplex worker. PiperOrigin-RevId: 525418088 Change-Id: I94d65d1c507e50b529243e416f13603a2de89e61 --- .../google/devtools/build/lib/worker/WorkerSpawnRunner.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 e792ecd1b52d1a..bf4cfe19fe8be2 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 @@ -157,7 +157,8 @@ public SpawnResult exec(Spawn spawn, SpawnExecutionContext context) context.report( SpawnSchedulingEvent.create( WorkerKey.makeWorkerTypeName( - Spawns.supportsMultiplexWorkers(spawn), context.speculating()))); + Spawns.supportsMultiplexWorkers(spawn) && workerOptions.workerMultiplex, + context.speculating()))); if (spawn.getToolFiles().isEmpty()) { throw createUserExecException( String.format(ERROR_MESSAGE_PREFIX + REASON_NO_TOOLS, spawn.getMnemonic()),