Code Review
/
doctor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
optimize the fault notification test
[doctor.git]
/
doctor_tests
/
inspector
/
sample.py
diff --git
a/doctor_tests/inspector/sample.py
b/doctor_tests/inspector/sample.py
index
fadfd3d
..
7742373
100644
(file)
--- a/
doctor_tests/inspector/sample.py
+++ b/
doctor_tests/inspector/sample.py
@@
-108,8
+108,11
@@
class SampleInspector(BaseInspector):
@utils.run_async
def _disable_compute_host(self, hostname):
self.nova.services.force_down(hostname, 'nova-compute', True)
@utils.run_async
def _disable_compute_host(self, hostname):
self.nova.services.force_down(hostname, 'nova-compute', True)
+
+ hostdown_time = time.time()
+ self.host_down_time = hostdown_time
self.log.info('doctor mark host(%s) down at %s'
self.log.info('doctor mark host(%s) down at %s'
- % (hostname,
time.time()
))
+ % (hostname,
hostdown_time
))
@utils.run_async
def _vms_reset_state(self, state, hostname):
@utils.run_async
def _vms_reset_state(self, state, hostname):
@@
-117,8
+120,10
@@
class SampleInspector(BaseInspector):
@utils.run_async
def _vm_reset_state(nova, server, state):
nova.servers.reset_state(server, state)
@utils.run_async
def _vm_reset_state(nova, server, state):
nova.servers.reset_state(server, state)
+ vmdown_time = time.time()
+ self.vm_down_time = vmdown_time
self.log.info('doctor mark vm(%s) error at %s'
self.log.info('doctor mark vm(%s) error at %s'
- % (server,
time.time()
))
+ % (server,
vmdown_time
))
thrs = []
for nova, server in zip(self.novaclients, self.servers[hostname]):
thrs = []
for nova, server in zip(self.novaclients, self.servers[hostname]):
@@
-168,7
+173,7
@@
class InspectorApp(Thread):
self.inspector.handle_events(events)
return "OK"
self.inspector.handle_events(events)
return "OK"
- @app.route('/shutdown', methods=['POST'])
+ @app.route('/
events/
shutdown', methods=['POST'])
def shutdown():
self.log.info('shutdown inspector app server at %s' % time.time())
func = request.environ.get('werkzeug.server.shutdown')
def shutdown():
self.log.info('shutdown inspector app server at %s' % time.time())
func = request.environ.get('werkzeug.server.shutdown')