fix: use rpcinterface to spawn process with autosratr=true, if there are any dependee processes

Author: Michael Hammann

supervisor/process.py

@@ -31,6 +31,13 @@
 
 from supervisor.socket_manager import SocketManager
 
+from supervisor.rpcinterface import SupervisorNamespaceRPCInterface
+from supervisor.xmlrpc import (
+    capped_int,
+    Faults,
+    RPCError,
+    )
+
 @functools.total_ordering
 class Subprocess(object):
 
@@ -195,32 +202,6 @@ def spawn(self):
 
         Return the process id.  If the fork() call fails, return None.
         """
-        # this section is ownly triggered when using autostart - 
-        # otherwise the dependencies are handled in the rpcinterface
-        # check if the process is dependent upon any other process and if so,
-        # make sure that one is in the RUNNING state
-        if self.config.depends_on is not None:
-            # keep track of RUNNING childs
-            running_childs = set()
-            # wait/loop until all childs are running
-            while set(self.config.depends_on.keys()) != running_childs:
-                for child in self.config.depends_on.values():
-                    if child.state is not ProcessStates.RUNNING:
-                        # potentially remove child, if it is in running list
-                        if child.config.name in running_childs:
-                            running_childs.remove(child.config.name)
-                        # check if it needs to be started
-                        if child.state is not (ProcessStates.STARTING or ProcessStates.RUNNING):
-                            child.spawn()
-                        else:
-                            child.transition()
-                            msg = ("waiting on dependee process {} to reach running state - currently in {}"
-                            .format(child.config.name, getProcessStateDescription(child.state)))
-                            self.config.options.logger.warn(msg)
-                    else:
-                        # child is running - add to set
-                        running_childs.add(child.config.name)
-                time.sleep(0.5)
 
         options = self.config.options
         processname = as_string(self.config.name)
@@ -676,7 +657,7 @@ def __repr__(self):
     def get_state(self):
         return self.state
 
-    def transition(self):
+    def transition(self, supervisord_instance=None):
         now = time.time()
         state = self.state
 
@@ -698,7 +679,14 @@ def transition(self):
             elif state == ProcessStates.STOPPED and not self.laststart:
                 if self.config.autostart:
                     # STOPPED -> STARTING
-                    self.spawn()
+                    # make sure dependent processes are spawned before
+                    # check if the process is dependent upon any other process and if so,
+                    # make sure that one is in the RUNNING state
+                    if self.config.depends_on is not None:
+                        rpc_interface = SupervisorNamespaceRPCInterface(supervisord_instance)
+                        rpc_interface.startProcess(self.group.config.name + ':' + self.config.name)
+                    else:
+                        self.spawn()
             elif state == ProcessStates.BACKOFF:
                 if self.backoff <= self.config.startretries:
                     if now > self.delay:
@@ -865,9 +853,9 @@ def before_remove(self):
         pass
 
 class ProcessGroup(ProcessGroupBase):
-    def transition(self):
+    def transition(self, supervisord_instance):
         for proc in self.processes.values():
-            proc.transition()
+            proc.transition(supervisord_instance)
 
 class FastCGIProcessGroup(ProcessGroup):
 

supervisor/supervisord.py

@@ -263,7 +263,7 @@ def runforever(self):
                         combined_map[fd].handle_error()
 
             for group in pgroups:
-                group.transition()
+                group.transition(self)
 
             self.reap()
             self.handle_signal()