fix race condition in build wait timers for substantiated workers

buildbot · Jan 25, 2022 · d191fa8 · d191fa8
1 parent b003893
commit d191fa8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/master/buildbot/worker/latent.py b/master/buildbot/worker/latent.py
@@ -236,7 +236,9 @@ def substantiate(self, wfb, build):
             return defer.succeed(False)
 
         if self.state == States.SUBSTANTIATED and self.conn is not None:
-            self._setBuildWaitTimer()
+            # Skip the wait timer if a build is already queued
+            if not self.building:
+                self._setBuildWaitTimer()
             return defer.succeed(True)
 
         if self.state in [States.SUBSTANTIATING,