cmd/coordinator: fix occasionally disappearing branch suffixes
Fixes golang/go#34234
Change-Id: I2dcd48a9e3900fad9916103737b47d945256faa7
Reviewed-on: https://go-review.googlesource.com/c/build/+/204597
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>
Run-TryBot: Dmitri Shuralyov <dmitshur@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/cmd/coordinator/coordinator.go b/cmd/coordinator/coordinator.go
index b250c51..637a75f 100644
--- a/cmd/coordinator/coordinator.go
+++ b/cmd/coordinator/coordinator.go
@@ -1346,6 +1346,8 @@
// start a new build if the old one appears dead or
// hung.
+ old := bs
+
// Sleep a bit and retry.
time.Sleep(30 * time.Second)
if !ts.wanted() {
@@ -1353,6 +1355,7 @@
}
bs, _ = newBuild(brev)
bs.trySet = ts
+ bs.goBranch = old.goBranch
go bs.start()
ts.mu.Lock()
ts.builds[idx] = bs
