BUGFIX: Some steps would get skipped because of an incomplete check

[plstackapi.git] / planetstack / openstack_observer / event_loop.py

diff --git a/planetstack/openstack_observer/event_loop.py b/planetstack/openstack_observer/event_loop.py
index 9e8c7b4..cc0611c 100644 (file)
--- a/planetstack/openstack_observer/event_loop.py
+++ b/planetstack/openstack_observer/event_loop.py
@@ -12,6 +12,7 @@ from datetime import datetime
 from collections import defaultdict
 from core.models import *
 from django.db.models import F, Q
+from django.db import connection
 #from openstack.manager import OpenStackManager
 from openstack.driver import OpenStackDriver
 from util.logger import Logger, logging, logger
@@ -21,9 +22,21 @@ from observer.steps import *
 from syncstep import SyncStep
 from toposort import toposort
 from observer.error_mapper import *
+from openstack_observer.openstacksyncstep import OpenStackSyncStep
+
 
 debug_mode = False
 
+class bcolors:
+    HEADER = '\033[95m'
+    OKBLUE = '\033[94m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[93m'
+    FAIL = '\033[91m'
+    ENDC = '\033[0m'
+    BOLD = '\033[1m'
+    UNDERLINE = '\033[4m'
+
 logger = Logger(level=logging.INFO)
 
 class StepNotReady(Exception):
@@ -49,7 +62,7 @@ def invert_graph(g):
        return ig
 
 class PlanetStackObserver:
-       #sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivileges,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
+       #sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivilege,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
        sync_steps = []
 
        
@@ -95,7 +108,7 @@ class PlanetStackObserver:
                                        # provides field (this eliminates the abstract base classes
                                        # since they don't have a provides)
 
-                                       if inspect.isclass(c) and issubclass(c, SyncStep) and hasattr(c,"provides") and (c not in self.sync_steps):
+                                       if inspect.isclass(c) and (issubclass(c, SyncStep) or issubclass(c,OpenStackSyncStep)) and hasattr(c,"provides") and (c not in self.sync_steps):
                                                self.sync_steps.append(c)
                logger.info('loaded sync steps: %s' % ",".join([x.__name__ for x in self.sync_steps]))
                # print 'loaded sync steps: %s' % ",".join([x.__name__ for x in self.sync_steps])
@@ -238,6 +251,7 @@ class PlanetStackObserver:
                                raise StepNotReady
 
        def sync(self, S, deletion):
+            try:
                step = self.step_lookup[S]
                start_time=time.time()
 
@@ -252,10 +266,13 @@ class PlanetStackObserver:
                except KeyError:
                        has_deps = False
 
+               go = False
+
                if (has_deps):
                        for d in deps:
                                 if d==step.__name__:
                                     logger.info("   step %s self-wait skipped" % step.__name__)
+                                   go = True
                                     continue
 
                                cond = self.step_conditions[d]
@@ -264,7 +281,7 @@ class PlanetStackObserver:
                                         logger.info("  step %s wait on dep %s" % (step.__name__, d))
                                        cond.wait()
                                cond.release()
-                       go = self.step_status[d] == STEP_STATUS_OK
+                       go = go or self.step_status[d] == STEP_STATUS_OK
                else:
                        go = True
 
@@ -337,6 +354,8 @@ class PlanetStackObserver:
                except KeyError,e:
                        logger.info('Step %r is a leaf' % step)
                        pass
+            finally:
+                connection.close()
 
        def run(self):
                if not self.driver.enabled: