RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-02 09:02:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

qa/tasks/ceph: stop any split/merge activity before scrubbing

Browse Source 
If there are leftover merges at the end of the run they can take a long
time to get through, blowing our timeout for (waiting for pgs to become
active and to stop splitting/merge) and scrubbing pgs.  Stop all of that
at the end of the run so that we don't have to wait so long.

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-01-12 05:32:54 -06:00
parent 5dfcb551ff
commit 54c5202b74
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qa/tasks/ceph.py
View File

@ -1932,6 +1932,10 @@ def task(ctx, config):
yield
finally:
# set pg_num_targets back to actual pg_num, so we don't have to
# wait for pending merges (which can take a while!)
ctx.managers[config['cluster']].stop_pg_num_changes()
if config.get('wait-for-scrub', True):
osd_scrub_pgs(ctx, config)

15
qa/tasks/ceph_manager.py
View File

@ -1796,6 +1796,21 @@ class CephManager:
self.pools[pool_name] = new_pg_num
return True
def stop_pg_num_changes(self):
"""
Reset all pg_num_targets back to pg_num, canceling splits and merges
"""
self.log('Canceling any pending splits or merges...')
osd_dump = self.get_osd_dump_json()
for pool in osd_dump['pools']:
if pool['pg_num'] != pool['pg_num_target']:
self.log('Setting pool %s (%d) pg_num %d -> %d' %
(pool['pool_name'], pool['pool'],
pool['pg_num_target'],
pool['pg_num']))
self.raw_cluster_cmd('osd', 'pool', 'set', pool['pool_name'],
'pg_num', str(pool['pg_num']))
def set_pool_pgpnum(self, pool_name, force):
"""
Set pgpnum property of pool_name pool.