feat: use set to keep track of processes that are already added to process queue

Author: Michael Hammann

supervisor/process.py

@@ -203,14 +203,13 @@ def spawn(self, supervisor=None):
         # make sure that one is in the RUNNING state
         # spawn if all dependees are running - else add to queue if not in queue already
         if self.config.depends_on is not None and any([dependee.state is not ProcessStates.RUNNING for dependee in self.config.depends_on.values()]):
-            print('called spawn with dependency for process', self)
             # all dependees that are not in queue and not in STARTING need to be added to queue.
             for dependee in self.config.depends_on.values():
                 if dependee.state is not (ProcessStates.STARTING or ProcessStates.RUNNING):
-                    if dependee not in supervisor.process_queue:
+                    if dependee.config.name not in supervisor.waiting_to_be_spawned:
                         supervisor.process_queue.append(dependee)
+                        supervisor.waiting_to_be_spawned.add(dependee.config.name)
         else:
-            print('called spawn')
             # if runningregex is used, set the log_offset correctly
             if self.config.runningregex is not None:
                 try:

supervisor/rpcinterface.py

@@ -330,6 +330,8 @@ def startProcess(self, name, wait=True):
 
         process.spawn(self.supervisord)
 
+        #TODO make sure this process is properly spawned in the end and correctly handled now.
+
         # We call reap() in order to more quickly obtain the side effects of
         # process.finish(), which reap() eventually ends up calling.  This
         # might be the case if the spawn() was successful but then the process

supervisor/supervisord.py

@@ -60,6 +60,7 @@ def __init__(self, options):
         self.process_groups = {}
         self.ticks = {}
         self.process_queue = deque()
+        self.waiting_to_be_spawned = set()
 
     def main(self):
         if not self.options.first:
@@ -274,18 +275,28 @@ def runforever(self):
                 # spawn if all dependencies are running or process has no dependencies
                 if self.process_queue[-1].config.depends_on is not None:
                     if all([dependee.get_state() == ProcessStates.RUNNING for dependee in self.process_queue[-1].config.depends_on.values()]):
-                        self.process_queue.pop().spawn(self)
+                        ready_process = self.process_queue.pop()
+                        ready_process.spawn(self)
+                        try:
+                            self.waiting_to_be_spawned.remove(ready_process.config.name)
+                        except KeyError:
+                            pass
                     # add any dependee which is not RUNNING or STARTING to queue
                     else:
                         for dependee in self.process_queue[-1].config.depends_on.values():
-                            #print('dependee is: ', dependee, dependee.state, dependee.state == ProcessStates.STOPPED)
                             if dependee.state is not (ProcessStates.STARTING or ProcessStates.RUNNING):
                                 # Should we check if the process is already in the queue?
-                                self.process_queue.append(dependee)
+                                if dependee.config.name not in self.waiting_to_be_spawned:
+                                    self.process_queue.append(dependee)
+                                    self.waiting_to_be_spawned.add(dependee.config.name)
 
                 else:
-                    print('spawning something with no dependency!')
-                    self.process_queue.pop().spawn(self)
+                    ready_process = self.process_queue.pop()
+                    ready_process.spawn(self)
+                    try:
+                        self.waiting_to_be_spawned.remove(ready_process.config.name)
+                    except KeyError:
+                        pass
 
             self.reap()
             self.handle_signal()