]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
qa/tasks: do not cancel pending pg num changes on mimic 34579/head
authorKefu Chai <kchai@redhat.com>
Thu, 16 Apr 2020 03:33:18 +0000 (11:33 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 29 Apr 2020 15:56:19 +0000 (23:56 +0800)
commitc6a4bba949772ffdc53a0bb938f0b0da541d4dde
tree03c8f05ca178c83479ac8fe945b7a0739c48a276
parent91612cc8acf7c24fff7ce2002fb46d5179515ef8
qa/tasks: do not cancel pending pg num changes on mimic

mimic does not support auto split/merge, but we do test mimic-x on
nautilus, which ends up with failures like:

ceback (most recent call last):
  File "/home/teuthworker/src/git.ceph.com_git_teuthology_py2/teuthology/contextutil.py", line 34, in nested
    yield vars
  File "/home/teuthworker/src/git.ceph.com_ceph_nautilus/qa/tasks/ceph.py", line 1928, in task
    ctx.managers[config['cluster']].stop_pg_num_changes()
  File "/home/teuthworker/src/git.ceph.com_ceph_nautilus/qa/tasks/ceph_manager.py", line 1806, in stop_pg_num_changes
    if pool['pg_num'] != pool['pg_num_target']:
KeyError: 'pg_num_target'

so we need to skip this if 'pg_num_target' is not in pg_pool_t::dump().

this change is not cherry-picked from master, as we don't test
mimic-x on master.

Signed-off-by: Kefu Chai <kchai@redhat.com>
qa/tasks/ceph.py
qa/tasks/ceph_manager.py