From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 26 Jan 2017 05:25:48 +0000 (-0500)
Subject: qa: timeout thrasher if fs does not stabilize
X-Git-Tag: v12.0.1~155^2~13
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=638bccb2bb7eb71e6296d93e505ffae3f28d1422;p=ceph.git

qa: timeout thrasher if fs does not stabilize

After 5 minutes of waiting, it's reasonable to stop as the cluster is
probably stuck.

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

diff --git a/qa/tasks/mds_thrash.py b/qa/tasks/mds_thrash.py
index c9f25451da0..b697125d6f8 100644
--- a/qa/tasks/mds_thrash.py
+++ b/qa/tasks/mds_thrash.py
@@ -187,7 +187,9 @@ class MDSThrasher(Greenlet):
                     self.log('mds cluster has {count} alive and active, now stable!'.format(count = count))
                     return status, None
             itercount = itercount + 1
-            if itercount > 10:
+            if itercount > 300/2: # 5 minutes
+                 raise RuntimeError('timeout waiting for cluster to stabilize')
+            elif itercount > 10:
                 self.log('mds map: {status}'.format(status=self.fs.status()))
             time.sleep(2)
             status = self.fs.status()