thrashosds: change min_in from 2 -> 3

See #7171. In rare cases CRUSH can't handle it when only 2/6 of
the OSDs are marked in.  Avoid those situations for now.

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

diff --git a/teuthology/task/ceph_manager.py b/teuthology/task/ceph_manager.py
index 51a6d4eda405bfb40cd09b1168a5029786b8554c..640dfa3fe9537eb8cdb76e72184981d6023bc091 100644 (file)
--- a/teuthology/task/ceph_manager.py
+++ b/teuthology/task/ceph_manager.py
@@ -23,7 +23,7 @@ class Thrasher:
         if self.config.get('powercycle'):
             self.revive_timeout += 120
         self.clean_wait = self.config.get('clean_wait', 0)
-        self.minin = self.config.get("min_in", 2)
+        self.minin = self.config.get("min_in", 3)
 
         num_osds = self.in_osds + self.out_osds
         self.max_pgs = self.config.get("max_pgs_per_pool_osd", 1200) * num_osds

diff --git a/teuthology/task/thrashosds.py b/teuthology/task/thrashosds.py
index 075e1f83c75cb1d26ee30771995ca3c08a6d0af4..2bdd73d14fbc6e1d7937d101f4289069d9c8b5a3 100644 (file)
--- a/teuthology/task/thrashosds.py
+++ b/teuthology/task/thrashosds.py
@@ -22,7 +22,7 @@ def task(ctx, config):
 
     The config is optional, and is a dict containing some or all of:
 
-    min_in: (default 2) the minimum number of OSDs to keep in the
+    min_in: (default 3) the minimum number of OSDs to keep in the
        cluster
 
     min_out: (default 0) the minimum number of OSDs to keep out of the