From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 21 Jun 2017 21:41:25 +0000 (-0700)
Subject: qa: add timeout/repeat to pool df
X-Git-Tag: v12.1.1~145^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=95c0ca6a2b0870354506e2b8f40cb00eca1df81b;p=ceph.git

qa: add timeout/repeat to pool df

Fixes: http://tracker.ceph.com/issues/20212

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_misc.py b/qa/tasks/cephfs/test_misc.py
index beb3ab844cc9..2774423dafb3 100644
--- a/qa/tasks/cephfs/test_misc.py
+++ b/qa/tasks/cephfs/test_misc.py
@@ -61,12 +61,13 @@ class TestMisc(CephFSTestCase):
 
         self.fs.put_metadata_object_raw("key", dummyfile)
 
-        timeout = 10
+        def get_pool_df(fs, name):
+            try:
+                return fs.get_pool_df(name)['objects'] > 0
+            except RuntimeError as e:
+                return False
 
-        get_pool_df = self.fs.get_pool_df
-        self.wait_until_true(
-                lambda: get_pool_df(self.fs.metadata_pool_name)['objects'] > 0,
-                timeout=timeout)
+        self.wait_until_true(lambda: get_pool_df(self.fs, self.fs.metadata_pool_name), timeout=30)
 
         try:
             self.fs.mon_manager.raw_cluster_cmd('fs', 'new', self.fs.name,