git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
393db39
)
Update OpenStack Observer's event loop from EC2 observer
author
Sapan Bhatia
<gwsapan@gmail.com>
Wed, 23 Jul 2014 14:02:45 +0000
(10:02 -0400)
committer
Sapan Bhatia
<gwsapan@gmail.com>
Wed, 23 Jul 2014 20:25:53 +0000
(16:25 -0400)
planetstack/openstack_observer/event_loop.py
patch
|
blob
|
history
diff --git
a/planetstack/openstack_observer/event_loop.py
b/planetstack/openstack_observer/event_loop.py
index
ad9c073
..
0e54bd3
100644
(file)
--- a/
planetstack/openstack_observer/event_loop.py
+++ b/
planetstack/openstack_observer/event_loop.py
@@
-19,7
+19,7
@@
from planetstack.config import Config
from observer.steps import *
from syncstep import SyncStep
from toposort import toposort
from observer.steps import *
from syncstep import SyncStep
from toposort import toposort
-from
observer.error_mapper import error_mapper
+from
ec2_observer.error_mapper import *
debug_mode = False
debug_mode = False
@@
-234,12
+234,12
@@
class PlanetStackObserver:
logger.info('Waiting for event')
tBeforeWait = time.time()
logger.info('Waiting for event')
tBeforeWait = time.time()
- self.wait_for_event(timeout=
30
)
+ self.wait_for_event(timeout=
5
)
logger.info('Observer woke up')
# Two passes. One for sync, the other for deletion.
for deletion in (False,True):
logger.info('Observer woke up')
# Two passes. One for sync, the other for deletion.
for deletion in (False,True):
- logger.info('
Creation pass...'
)
+ logger.info('
Deletion=%r...'%deletion
)
# Set of whole steps that failed
failed_steps = []
# Set of whole steps that failed
failed_steps = []
@@
-269,7
+269,7
@@
class PlanetStackObserver:
# Various checks that decide whether
# this step runs or not
self.check_class_dependency(sync_step, failed_steps) # dont run Slices if Sites failed
# Various checks that decide whether
# this step runs or not
self.check_class_dependency(sync_step, failed_steps) # dont run Slices if Sites failed
- self.check_schedule(sync_step,deletion) # dont run sync_network_routes if time since last run < 1 hour
+ 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__)
should_run = True
except StepNotReady:
logging.info('Step not ready: %s'%sync_step.__name__)
@@
-295,10
+295,7
@@
class PlanetStackObserver:
if failed_objects:
failed_step_objects.update(failed_objects)
if failed_objects:
failed_step_objects.update(failed_objects)
- if (not deletion):
- self.update_run_time(sync_step)
- else:
- self.update_deletion_run_time(sync_step)
+ 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.log_exc(e)
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.log_exc(e)