From 90a9c13fc18ba000c16db1f5191a01c960de4813 Mon Sep 17 00:00:00 2001 From: Alex Rakoczy Date: Wed, 27 Jul 2022 20:43:19 -0400 Subject: [PATCH] internal/coordinator/pool: fix gce quota message Remove stray queue length call, which wasn't even in the correct spot for Sprintf. For golang/go#48857 Change-Id: I98bb33f0b3e51d5abe25d1675554b96be893b1f9 Reviewed-on: https://go-review.googlesource.com/c/build/+/419433 Auto-Submit: Jenny Rakoczy Reviewed-by: Dmitri Shuralyov Reviewed-by: Dmitri Shuralyov Run-TryBot: Jenny Rakoczy TryBot-Result: Gopher Robot --- internal/coordinator/pool/gce.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/internal/coordinator/pool/gce.go b/internal/coordinator/pool/gce.go index aa05f59d89..e385f0da3f 100644 --- a/internal/coordinator/pool/gce.go +++ b/internal/coordinator/pool/gce.go @@ -491,14 +491,13 @@ func (p *GCEBuildlet) String() string { func (p *GCEBuildlet) capacityString() string { p.mu.Lock() defer p.mu.Unlock() - qLen := p.cpuQueue.Len() cpuUsage, cpuLimit := p.cpuQueue.Quotas() c2Usage, c2Limit := p.c2cpuQueue.Quotas() instUsage, instLimit := p.instQueue.Quotas() n2Usage, n2Limit := p.n2cpuQueue.Quotas() n2dUsage, n2dLimit := p.n2dcpuQueue.Quotas() - return fmt.Sprintf("%d/%d instances; %d/%d CPUs (%d), %d/%d C2_CPUS, %d/%d N2_CPUS, %d/%d N2D_CPUS", - instUsage, instLimit, qLen, + return fmt.Sprintf("%d/%d instances; %d/%d CPUs, %d/%d C2_CPUS, %d/%d N2_CPUS, %d/%d N2D_CPUS", + instUsage, instLimit, cpuUsage, cpuLimit, c2Limit, c2Usage, n2Limit, n2Usage,