updates to use dependency based startup logic

daemon/core/service.py

@@ -414,18 +414,9 @@ class CoreServices(object):
         results = []
 
         services = sorted(node.services, key=lambda x: x.startindex)
-        for service in services:
-            if len(str(service.starttime)) > 0:
-                try:
-                    starttime = float(service.starttime)
-                    if starttime > 0.0:
-                        fn = self.bootnodeservice
-                        self.session.event_loop.add_event(starttime, fn, node, service, services, False)
-                        continue
-                except ValueError:
-                    logger.exception("error converting start time to float")
-            # self.bootnodeservice(node, service, services)
-            result = pool.apply_async(self.bootnodeservice, (node, service, services))
+        boot_paths = self.node_service_dependencies(services)
+        for boot_path in boot_paths:
+            result = pool.apply_async(self.boot_node_dependencies, (node, boot_path, services))
             results.append(result)
 
         pool.close()
@@ -433,6 +424,11 @@ class CoreServices(object):
         for result in results:
             result.get()
 
+    def boot_node_dependencies(self, node, boot_path, all_services):
+        logger.info("booting node service dependencies: %s", boot_path)
+        for service in boot_path:
+            self.bootnodeservice(node, service, all_services)
+
     def bootnodeservice(self, node, service, services):
         """
         Start a service on a node. Create private dirs, generate config
@@ -518,11 +514,11 @@ class CoreServices(object):
 
         status = 0
         for cmd in cmds:
-            logger.info("validating service %s using: %s", service.name, cmd)
+            logger.info("validating service(%s) using: %s", service.name, cmd)
             try:
                 node.check_cmd(cmd)
-            except CoreCommandError:
-                logger.exception("validate command failed")
+            except CoreCommandError as e:
+                logger.exception("node(%s) service(%s) validate command failed", node.name, service.name)
                 status = -1
 
         return status

daemon/core/services/bird.py

@@ -94,6 +94,7 @@ class BirdService(CoreService):
     name = None
     executables = ("bird",)
     group = "BIRD"
+    dependencies = ("bird",)
     depends = ("bird",)
     dirs = ()
     configs = ()

daemon/core/services/dockersvc.py

@@ -104,7 +104,7 @@ from core.service import ServiceManager
 try:
     from docker import Client
 except ImportError:
-    logger.error("failure to import docker")
+    logger.warns("missing python docker bindings")
 
 
 class DockerService(CoreService):

daemon/core/services/quagga.py

@@ -222,6 +222,7 @@ class QuaggaService(CoreService):
     """
     name = None
     group = "Quagga"
+    dependencies = ("zebra",)
     depends = ("zebra",)
     dirs = ()
     configs = ()

daemon/core/services/xorp.py

@@ -78,6 +78,7 @@ class XorpService(CoreService):
     name = None
     executables = ("xorp_rtrmgr",)
     group = "XORP"
+    dependencies = ("xorp_rtrmgr",)
     depends = ("xorp_rtrmgr",)
     dirs = ()
     configs = ()