BUGFIX: Some steps would get skipped because of an incomplete check
[plstackapi.git] / planetstack / openstack_observer / event_loop.py
index 1f15a8e..cc0611c 100644 (file)
@@ -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,8 +251,11 @@ class PlanetStackObserver:
                                raise StepNotReady
 
        def sync(self, S, deletion):
+            try:
                step = self.step_lookup[S]
                start_time=time.time()
+
+                logger.info("Starting to work on step %s" % step.__name__)
                
                dependency_graph = self.dependency_graph if not deletion else self.deletion_dependency_graph
 
@@ -250,19 +266,29 @@ 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]
                                cond.acquire()
                                if (self.step_status[d] is STEP_STATUS_WORKING):
+                                        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
 
                if (not go):
-                       self.failed_steps.append(sync_step)
+                        # SMBAKER: sync_step was not defined here, so I changed
+                        #    this from 'sync_step' to 'step'. Verify.
+                       self.failed_steps.append(step)
                        my_status = STEP_STATUS_KO
                else:
                        sync_step = step(driver=self.driver,error_map=self.error_mapper)
@@ -270,7 +296,7 @@ class PlanetStackObserver:
                        sync_step.dependencies = []
                        try:
                                mlist = sync_step.provides
-                               
+
                                for m in mlist:
                                        sync_step.dependencies.extend(self.model_dependency_graph[m.__name__])
                        except KeyError:
@@ -285,11 +311,11 @@ class PlanetStackObserver:
                                self.check_schedule(sync_step, deletion) # dont run sync_network_routes if time since last run < 1 hour
                                should_run = True
                        except StepNotReady:
-                               logging.info('Step not ready: %s'%sync_step.__name__)
+                               logger.info('Step not ready: %s'%sync_step.__name__)
                                self.failed_steps.append(sync_step)
                                my_status = STEP_STATUS_KO
                        except Exception,e:
-                               logging.error('%r',e)
+                               logger.error('%r' % e)
                                logger.log_exc("sync step failed: %r. Deletion: %r"%(sync_step,deletion))
                                self.failed_steps.append(sync_step)
                                my_status = STEP_STATUS_KO
@@ -307,16 +333,18 @@ class PlanetStackObserver:
                                        if failed_objects:
                                                self.failed_step_objects.update(failed_objects)
 
+                                        logger.info("Step %r succeeded" % step)
                                        my_status = STEP_STATUS_OK
                                        self.update_run_time(sync_step,deletion)
                                except Exception,e:
-                                       logging.error('Model step failed. This seems like a misconfiguration or bug: %r. This error will not be relayed to the user!',e)
+                                       logger.error('Model step %r failed. This seems like a misconfiguration or bug: %r. This error will not be relayed to the user!' % (step, e))
                                        logger.log_exc(e)
                                        self.failed_steps.append(S)
                                        my_status = STEP_STATUS_KO
                        else:
+                                logger.info("Step %r succeeded due to non-run" % step)
                                my_status = STEP_STATUS_OK
-               
+
                try:
                        my_cond = self.step_conditions[S]
                        my_cond.acquire()
@@ -324,8 +352,10 @@ class PlanetStackObserver:
                        my_cond.notify_all()
                        my_cond.release()
                except KeyError,e:
-                       logging.info('Step %r is a leaf')
+                       logger.info('Step %r is a leaf' % step)
                        pass
+            finally:
+                connection.close()
 
        def run(self):
                if not self.driver.enabled:
@@ -388,6 +418,6 @@ class PlanetStackObserver:
 
                                self.save_run_times()
                        except Exception, e:
-                               logging.error('Core error. This seems like a misconfiguration or bug: %r. This error will not be relayed to the user!',e)
+                               logger.error('Core error. This seems like a misconfiguration or bug: %r. This error will not be relayed to the user!' % e)
                                logger.log_exc("Exception in observer run loop")
                                traceback.print_exc()