From: Sage Weil <sage@inktank.com>
Date: Sat, 20 Jul 2013 04:53:33 +0000 (-0700)
Subject: mon_thrash: tolerate scrub command failure
X-Git-Tag: 1.1.0~2066
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=51c2963e539fd296b3fcd6e541913ef7f36043bf;p=teuthology.git

mon_thrash: tolerate scrub command failure

We can get EBUSY if there is an election going on.
---

diff --git a/teuthology/task/mon_thrash.py b/teuthology/task/mon_thrash.py
index e56d8761f..2035bf1e3 100644
--- a/teuthology/task/mon_thrash.py
+++ b/teuthology/task/mon_thrash.py
@@ -256,7 +256,10 @@ class MonitorThrasher:
 
       if self.scrub:
         self.log('triggering scrub')
-        self.manager.raw_cluster_cmd('scrub')
+        try:
+          self.manager.raw_cluster_cmd('scrub')
+        except:
+          pass
 
       if self.thrash_delay > 0.0:
         self.log('waiting for {delay} secs before continuing thrashing'.format(