From: Sage Weil <sage@redhat.com>
Date: Tue, 8 Aug 2017 16:08:31 +0000 (-0400)
Subject: qa/tasks/ceph.py: tolerate flush pg stats exception
X-Git-Tag: v13.0.0~163^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16905%2Fhead;p=ceph.git

qa/tasks/ceph.py: tolerate flush pg stats exception

If the OSD doesn't see IO, it won't flush more pg/osd stats when the
luminous flag is not yet set (legacy pgmonitor mode).

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 04f5737bc68d..358ec8d648e9 100644
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -1248,8 +1248,8 @@ def healthy(ctx, config):
 
     try:
         manager.flush_all_pg_stats()
-    except run.CommandFailedError:
-        log.info('ignoring flush pg stats error, probably testing upgrade')
+    except (run.CommandFailedError, Exception) as e:
+        log.info('ignoring flush pg stats error, probably testing upgrade: %s', e)
     manager.wait_for_clean()
 
     log.info('Waiting until ceph cluster %s is healthy...', cluster_name)