From: Sage Weil Date: Sat, 7 Apr 2018 19:59:54 +0000 (-0500) Subject: qa/suites: test pg merging X-Git-Tag: v14.0.1~371^2~14 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44de03d5e61b20536eaa5f8ad512b3575cae9280;p=ceph.git qa/suites: test pg merging Signed-off-by: Sage Weil --- diff --git a/qa/suites/big/rados-thrash/thrashers/default.yaml b/qa/suites/big/rados-thrash/thrashers/default.yaml index bcd3f39e399e..8f2b26674bf5 100644 --- 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 44c86ba6d200..48a7a2a293c0 100644 --- 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 7f7298605e8c..86b51709767b 100644 --- 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 f2ccf7f069ad..9983f9ca9882 100644 --- 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 afc43b8d2ccb..adaaae4bd538 100644 --- 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 3095cd8e74c5..fb3af9825f28 100644 --- 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 c6f02b345b1d..d70ed14e4898 100644 --- 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 caa467b0e80c..b5b240c41e4f 100644 --- 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 471e4af3f72f..86db1af54dfd 100644 --- 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 e8e2007f86d3..cdbbadca3570 100644 --- 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 7b55097f77b6..bbc3dbdcd527 100644 --- 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 bcd3f39e399e..8f2b26674bf5 100644 --- 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 d880d53b7d32..1f35f1bc9e31 100644 --- 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 6f35748c3eec..020b60fddd03 100644 --- 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 0c77640f9b32..84331efa2e6e 100644 --- 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 38a04979d05d..94d2ea6b0ff9 100644 --- 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 32c9c767393f..b3c956f6bf86 100644 --- 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: