debug_mode = False
-logger = Logger(logfile='observer.log', level=logging.INFO)
+logger = Logger(level=logging.INFO)
class StepNotReady(Exception):
pass
-def toposort(g, steps):
+def toposort(g, steps=None):
+ if (not steps):
+ keys = set(g.keys())
+ values = set({})
+ for v in g.values():
+ values=values | set(v)
+
+ steps=list(keys|values)
reverse = {}
for k,v in g.items():
marked.append(m)
except KeyError:
pass
- order.append(n)
+ if (n in steps):
+ order.append(n)
+ order.reverse()
order.extend(set(steps)-set(order))
return order
class PlanetStackObserver:
- sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivileges,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,GarbageCollector]
+ sync_steps = [SyncNetworks,SyncNetworkSlivers,SyncSites,SyncSitePrivileges,SyncSlices,SyncSliceMemberships,SyncSlivers,SyncSliverIps,SyncExternalRoutes,SyncUsers,SyncRoles,SyncNodes,SyncImages,GarbageCollector]
def __init__(self):
# The Condition object that gets signalled by Feefie events
self.event_cond.release()
def load_sync_steps(self):
- dep_path = Config().observer_backend_dependency_graph
+ dep_path = Config().observer_dependency_graph
try:
# This contains dependencies between records, not sync steps
self.model_dependency_graph = json.loads(open(dep_path).read())
self.last_run_times[step.__name__]=time.time()
def check_schedule(self, step):
- time_since_last_run = time.time() - self.last_run_times[step.__name__]
+ time_since_last_run = time.time() - self.last_run_times.get(step.__name__, 0)
try:
if (time_since_last_run < step.requested_interval):
raise StepNotReady
self.last_run_times[e]=0
-
def save_run_times(self):
run_times = json.dumps(self.last_run_times)
open('/tmp/observer_run_times','w').write(run_times)
def check_class_dependency(self, step, failed_steps):
+ step.dependenices = []
+ for obj in step.provides:
+ step.dependenices.extend(self.model_dependency_graph.get(obj.__name__, []))
for failed_step in failed_steps:
- step.dependencies = self.model_dependency_graph.get(step.provides[0].__name__, [])
if (failed_step in step.dependencies):
raise StepNotReady
failed_steps = []
# Set of individual objects within steps that failed
- failed_step_objects = []
+ failed_step_objects = set()
for S in self.ordered_steps:
step = self.step_lookup[S]
duration=time.time() - start_time
# ********* This is the actual sync step
- import pdb
- pdb.set_trace()
- failed_objects = sync_step(failed=failed_step_objects)
+ #import pdb
+ #pdb.set_trace()
+ failed_objects = sync_step(failed=list(failed_step_objects))
self.check_duration(sync_step, duration)
if failed_objects:
- failed_step_objects.extend(failed_objects)
+ failed_step_objects.update(failed_objects)
self.update_run_time(sync_step)
except:
- raise
failed_steps.append(S)
self.save_run_times()
except: