Merge pull request #1831 from djmitche/bug3330

maybeStartBuildsForSlave after insubstantiating
buildbot · Aug 30, 2015 · 7be0a1c · 7be0a1c
2 parents 8655792 + 60c3c01
commit 7be0a1c
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/master/buildbot/buildslave/base.py b/master/buildbot/buildslave/base.py
@@ -733,7 +733,8 @@ def _substantiation_failed(self, failure):
             self.substantiation_deferred = None
             self.substantiation_build = None
             d.errback(failure)
-        self.insubstantiate()
+        d = self.insubstantiate()
+        d.addErrback(log.err, 'while insubstantiating')
         # notify people, but only if we're still in the config
         if not self.parent or not self.notify_on_missing:
             return
@@ -770,7 +771,12 @@ def buildFinished(self, sb):
         self.building.remove(sb.builder_name)
         if not self.building:
             if self.build_wait_timeout == 0:
-                self.insubstantiate()
+                d = self.insubstantiate()
+                # try starting builds for this slave after insubstantiating;
+                # this will cause the slave to re-substantiate immediately if
+                # there are pending build requests.
+                d.addCallback(lambda _:
+                    self.botmaster.maybeStartBuildsForSlave(self.slavename))
             else:
                 self._setBuildWaitTimer()