fix: slot check moved to worker submission routine

Author: satra

nipype/pipeline/plugins/base.py

@@ -254,13 +254,8 @@ def run(self, graph, config, updatehash=False):
             num_jobs = len(self.pending_tasks)
             logger.debug('Number of pending tasks: %d' % num_jobs)
             if num_jobs < self.max_jobs:
-                if np.isinf(self.max_jobs):
-                    slots = None
-                else:
-                    slots = max(0, self.max_jobs - num_jobs)
-                logger.debug('Slots available: %s' % slots)
                 self._send_procs_to_workers(updatehash=updatehash,
-                                            slots=slots, graph=graph)
+                                            graph=graph)
             else:
                 logger.debug('Not submitting')
             sleep(float(self._config['execution']['poll_sleep_duration']))
@@ -324,16 +319,21 @@ def _submit_mapnode(self, jobid):
                                             np.zeros(numnodes, dtype=bool)))
         return False
 
-    def _send_procs_to_workers(self, updatehash=False, slots=None, graph=None):
+    def _send_procs_to_workers(self, updatehash=False, graph=None):
         """ Sends jobs to workers
         """
         while np.any(self.proc_done == False):
+            num_jobs = len(self.pending_tasks)
+            if np.isinf(self.max_jobs):
+                slots = None
+            else:
+                slots = max(0, self.max_jobs - num_jobs)
+            logger.debug('Slots available: %s' % slots)
+            if (num_jobs >= self.max_jobs) or (slots == 0):
+                break
             # Check to see if a job is available
             jobids = np.flatnonzero((self.proc_done == False) &
                                     (self.depidx.sum(axis=0) == 0).__array__())
-            num_jobs = len(self.pending_tasks)
-            if num_jobs >= self.max_jobs:
-                break
             if len(jobids) > 0:
                 # send all available jobs
                 logger.info('Submitting %d jobs' % len(jobids[:slots]))