qa/suites: test pg merging

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

diff --git a/qa/suites/big/rados-thrash/thrashers/default.yaml b/qa/suites/big/rados-thrash/thrashers/default.yaml
index bcd3f39e399e2e19e27180b41c0263336b1b7ad9..8f2b26674bf5b69b41029b51d3cd05b1516821d1 100644 (file)
--- a/qa/suites/big/rados-thrash/thrashers/default.yaml
+++ b/qa/suites/big/rados-thrash/thrashers/default.yaml
@@ -7,4 +7,5 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1

diff --git a/qa/suites/krbd/thrash/thrashers/backoff.yaml b/qa/suites/krbd/thrash/thrashers/backoff.yaml
index 44c86ba6d200af38607a4348a672a4b8833ea06c..48a7a2a293c01e58b7a3309116b5226a0580fa82 100644 (file)
--- a/qa/suites/krbd/thrash/thrashers/backoff.yaml
+++ b/qa/suites/krbd/thrash/thrashers/backoff.yaml
@@ -11,4 +11,5 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1

diff --git a/qa/suites/krbd/thrash/thrashers/upmap.yaml b/qa/suites/krbd/thrash/thrashers/upmap.yaml
index 7f7298605e8c2f85c5bfd9f56d04609fb9307899..86b51709767bbb2154179057e5876e51ed5d4ed8 100644 (file)
--- a/qa/suites/krbd/thrash/thrashers/upmap.yaml
+++ b/qa/suites/krbd/thrash/thrashers/upmap.yaml
@@ -11,6 +11,7 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     chance_thrash_pg_upmap: 3
     chance_thrash_pg_upmap_items: 3

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
index f2ccf7f069adbe054bec57bb9bcd8cc29e6a6797..9983f9ca988228044fbec1ca5e88766034e2df10 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml
@@ -14,5 +14,6 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     min_in: 8

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
index afc43b8d2ccb4322097eba3117b69348debf2a0b..adaaae4bd5385b5cd5f106982b743cae5292ca49 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml
@@ -15,5 +15,6 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     min_in: 4

diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml
index 3095cd8e74c58b19dc928f39fef19e777d456352..fb3af9825f2820023474d3c3b370d52db2413015 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml
@@ -15,6 +15,7 @@ tasks:
 - thrashosds:
     timeout: 1800
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     chance_test_map_discontinuity: 0.5
     min_in: 8

diff --git a/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml b/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
index c6f02b345b1d0a6907920152cfd4b930fb4beeba..d70ed14e4898dd7b86f7a7702a9e100029bd27b1 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
+++ b/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml
@@ -14,5 +14,6 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     min_in: 8

diff --git a/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml
index caa467b0e80c27283966825ee21690a9a17a50dc..b5b240c41e4f55dc533f7f5d65c9495f34328558 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/default.yaml
@@ -13,5 +13,6 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     min_in: 4

diff --git a/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml b/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
index 471e4af3f72f9f5e7b8b52df3f9589a63aa0d60b..86db1af54dfd92c6231c546c8752a844ed750c72 100644 (file)
--- a/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
+++ b/qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml
@@ -15,5 +15,6 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     min_in: 4

diff --git a/qa/suites/rados/thrash/thrashers/default.yaml b/qa/suites/rados/thrash/thrashers/default.yaml
index e8e2007f86d323fe860383b06a3a705547683135..cdbbadca3570d0ff3c8bd6f9564ca950fadf4dd9 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/default.yaml
+++ b/qa/suites/rados/thrash/thrashers/default.yaml
@@ -21,4 +21,5 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1

diff --git a/qa/suites/rados/thrash/thrashers/mapgap.yaml b/qa/suites/rados/thrash/thrashers/mapgap.yaml
index 7b55097f77b6ba5edf9f2cdd0ff9fc05965dc7ca..bbc3dbdcd527bc0006763d982cfbbad4b8f04411 100644 (file)
--- a/qa/suites/rados/thrash/thrashers/mapgap.yaml
+++ b/qa/suites/rados/thrash/thrashers/mapgap.yaml
@@ -22,5 +22,6 @@ tasks:
 - thrashosds:
     timeout: 1800
     chance_pgnum_grow: 0.25
+    chance_pgnum_shrink: 0.25
     chance_pgpnum_fix: 0.25
     chance_test_map_discontinuity: 2

diff --git a/qa/suites/rados/verify/d-thrash/default/default.yaml b/qa/suites/rados/verify/d-thrash/default/default.yaml
index bcd3f39e399e2e19e27180b41c0263336b1b7ad9..8f2b26674bf5b69b41029b51d3cd05b1516821d1 100644 (file)
--- a/qa/suites/rados/verify/d-thrash/default/default.yaml
+++ b/qa/suites/rados/verify/d-thrash/default/default.yaml
@@ -7,4 +7,5 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1

diff --git a/qa/suites/rgw/thrash/thrasher/default.yaml b/qa/suites/rgw/thrash/thrasher/default.yaml
index d880d53b7d322efc8dfc7da541916c744689cf70..1f35f1bc9e315969f16930f18a3b199639d3c368 100644 (file)
--- a/qa/suites/rgw/thrash/thrasher/default.yaml
+++ b/qa/suites/rgw/thrash/thrasher/default.yaml
@@ -2,6 +2,7 @@ tasks:
 - thrashosds:
     timeout: 1200
     chance_pgnum_grow: 1
+    chance_pgnum_shrink: 1
     chance_pgpnum_fix: 1
     op_delay: 30
     chance_test_min_size: 0

diff --git a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
index 6f35748c3eecd89f890fd5f9662864f912d68ffa..020b60fddd03312efe7ee7022ed559f0a801f4b1 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml
@@ -20,6 +20,7 @@ tasks:
         mon warn on pool no app: false
 - thrashosds:
     chance_pgnum_grow: 2
+    chance_pgnum_shrink: 2
     chance_pgpnum_fix: 1
     timeout: 1200
 - workunit:

diff --git a/qa/suites/smoke/basic/tasks/rados_bench.yaml b/qa/suites/smoke/basic/tasks/rados_bench.yaml
index 0c77640f9b3212761d0e894e43e1b9e91f54c428..84331efa2e6e6ab951c18ec4db412d2213ffca67 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_bench.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_bench.yaml
@@ -24,6 +24,7 @@ tasks:
       - \(TOO_FEW_PGS\)
 - thrashosds:
     chance_pgnum_grow: 2
+    chance_pgnum_shrink: 2
     chance_pgpnum_fix: 1
     timeout: 1200
 - full_sequential:

diff --git a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
index 38a04979d05dcb35cde2daa12050c8370281b2fd..94d2ea6b0ff93ea5c8c09cd9524a6540863a528d 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml
@@ -14,6 +14,7 @@ tasks:
       - \(TOO_FEW_PGS\)
 - thrashosds:
     chance_pgnum_grow: 2
+    chance_pgnum_shrink: 2
     chance_pgpnum_fix: 1
     timeout: 1200
 - exec:

diff --git a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
index 32c9c767393fe4d264652447d1a161e0af5e68e0..b3c956f6bf8670c605bf175e196b104ed7fc4151 100644 (file)
--- a/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
+++ b/qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml
@@ -15,6 +15,7 @@ tasks:
       - \(TOO_FEW_PGS\)
 - thrashosds:
     chance_pgnum_grow: 3
+    chance_pgnum_shrink: 2
     chance_pgpnum_fix: 1
     timeout: 1200
 - rados: