RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-25 11:48:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1053 from ceph/wip-thrash-raise

Browse Source 
task/mds_thrash: don't drop exceptions from thrasher
This commit is contained in:
Gregory Farnum 2016-06-16 07:25:16 -07:00 committed by GitHub
commit 2b5b66d6c4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tasks/mds_thrash.py
View File

@ -272,7 +272,7 @@ class MDSThrasher(Greenlet):
time.sleep(delay)
self.log('reviving mds.{id}'.format(id=active_mds))
self.manager.revive_mds(active_mds, standby_for_rank=takeover_rank)
self.revive_mds(active_mds, standby_for_rank=takeover_rank)
status = {}
while True:
@ -294,7 +294,7 @@ class MDSThrasher(Greenlet):
delay = random.randrange(0.0, self.max_replay_thrash_delay)
time.sleep(delay)
self.log('kill replaying mds.{id}'.format(id=self.to_kill))
self.manager.kill_mds(self.to_kill)
self.kill_mds(self.to_kill)
delay = self.max_revive_delay
if self.randomize:
@ -305,7 +305,7 @@ class MDSThrasher(Greenlet):
time.sleep(delay)
self.log('revive mds.{id}'.format(id=self.to_kill))
self.manager.revive_mds(self.to_kill)
self.revive_mds(self.to_kill)
@contextlib.contextmanager
@ -411,5 +411,6 @@ def task(ctx, config):
for t in thrashers:
log.info('join thrasher for failure group [{fg}]'.format(fg=', '.join(failure_group)))
thrashers[t].stop()
thrashers[t].get() # Raise any exception from _run()
thrashers[t].join()
log.info('done joining')