Merge pull request #556 from ceph/wip-stuck-pg-dump

tasks/ceph_manager: dump pgs when recover times out

Reviewed-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Sage Weil 2015-09-08 09:12:53 -04:00
commit 2019a78cb5

View File

@ -1608,8 +1608,12 @@ class CephManager:
start = time.time()
else:
self.log("no progress seen, keeping timeout for now")
assert time.time() - start < timeout, \
'failed to recover before timeout expired'
if time.time() - start >= timeout:
self.log('dumping pgs')
out = self.raw_cluster_cmd('pg', 'dump')
self.log(out)
assert time.time() - start < timeout, \
'failed to recover before timeout expired'
cur_active_recovered = self.get_num_active_recovered()
if cur_active_recovered != num_active_recovered:
start = time.time()