qa/tasks: Fix ambiguous store_thrash, thrash_store

Fixes: http://tracker.ceph.com/issues/39159
Signed-off-by: Jos Collin <jcollin@redhat.com>

diff --git a/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml b/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
index 2d1ba8824029cd791ee1f7bafd0a838b69af006c..829e3592b3c21a85d12a82916d9839de3b13760f 100644 (file)
--- a/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
+++ b/qa/suites/rados/monthrash/thrashers/force-sync-many.yaml
@@ -8,5 +8,5 @@ tasks:
 - mon_thrash:
     revive_delay: 90
     thrash_delay: 1
-    thrash_store: true
+    store_thrash: true
     thrash_many: true

diff --git a/qa/tasks/mon_thrash.py b/qa/tasks/mon_thrash.py
index dc1866a2c6adb1213261a882ab60913cec3f4d6f..0f85038152aa0327c056fa68d135a367065e2ad9 100644 (file)
--- a/qa/tasks/mon_thrash.py
+++ b/qa/tasks/mon_thrash.py
@@ -41,11 +41,11 @@ class MonitorThrasher:
                         the monitor (default: 10)
     thrash_delay        Number of seconds to wait in-between
                         test iterations (default: 0)
-    thrash_store        Thrash monitor store before killing the monitor being thrashed (default: False)
-    thrash_store_probability  Probability of thrashing a monitor's store
+    store_thrash        Thrash monitor store before killing the monitor being thrashed (default: False)
+    store_thrash_probability  Probability of thrashing a monitor's store
                               (default: 50)
     thrash_many         Thrash multiple monitors instead of just one. If
-                        'maintain-quorum' is set to False, then we will
+                        'maintain_quorum' is set to False, then we will
                         thrash up to as many monitors as there are
                         available. (default: False)
     maintain_quorum     Always maintain quorum, taking care on how many
@@ -62,7 +62,7 @@ class MonitorThrasher:
     scrub               Scrub after each iteration (default: True)
     check_mds_failover  Check if mds failover happened (default: False)
 
-    Note: if 'store-thrash' is set to True, then 'maintain-quorum' must also
+    Note: if 'store_thrash' is set to True, then 'maintain_quorum' must also
           be set to True.
 
     For example::
@@ -72,8 +72,8 @@ class MonitorThrasher:
     - mon_thrash:
         revive_delay: 20
         thrash_delay: 1
-        thrash_store: true
-        thrash_store_probability: 40
+        store_thrash: true
+        store_thrash_probability: 40
         seed: 31337
         maintain_quorum: true
         thrash_many: true