From: Patrick Donnelly Date: Tue, 16 May 2017 22:43:57 +0000 (-0400) Subject: qa: silence upgrade test failure X-Git-Tag: v12.1.0~10^2~78^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F15126%2Fhead;p=ceph.git qa: silence upgrade test failure The new fs setting standby_count_wanted is only avialable in luminous. Upgrade tests were tripping on this. Fixes: http://tracker.ceph.com/issues/19934 Signed-off-by: Patrick Donnelly --- diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py index 8efd05e9eca1..01e1ca588c1e 100644 --- a/qa/tasks/cephfs/filesystem.py +++ b/qa/tasks/cephfs/filesystem.py @@ -457,7 +457,14 @@ class Filesystem(MDSCluster): self.mon_manager.raw_cluster_cmd('fs', 'new', self.name, self.metadata_pool_name, data_pool_name) # Turn off spurious standby count warnings from modifying max_mds in tests. - self.mon_manager.raw_cluster_cmd('fs', 'set', self.name, 'standby_count_wanted', '0') + try: + self.mon_manager.raw_cluster_cmd('fs', 'set', self.name, 'standby_count_wanted', '0') + except CommandFailedError as e: + if e.exitstatus == 22: + # standby_count_wanted not available prior to luminous (upgrade tests would fail otherwise) + pass + else: + raise self.getinfo(refresh = True)