From 44de03d5e61b20536eaa5f8ad512b3575cae9280 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sat, 7 Apr 2018 14:59:54 -0500 Subject: [PATCH] qa/suites: test pg merging Signed-off-by: Sage Weil --- qa/suites/big/rados-thrash/thrashers/default.yaml | 1 + qa/suites/krbd/thrash/thrashers/backoff.yaml | 1 + qa/suites/krbd/thrash/thrashers/upmap.yaml | 1 + qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml | 1 + qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml | 1 + qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml | 1 + qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml | 1 + qa/suites/rados/thrash-erasure-code/thrashers/default.yaml | 1 + qa/suites/rados/thrash-erasure-code/thrashers/fastread.yaml | 1 + qa/suites/rados/thrash/thrashers/default.yaml | 1 + qa/suites/rados/thrash/thrashers/mapgap.yaml | 1 + qa/suites/rados/verify/d-thrash/default/default.yaml | 1 + qa/suites/rgw/thrash/thrasher/default.yaml | 1 + qa/suites/smoke/basic/tasks/rados_api_tests.yaml | 1 + qa/suites/smoke/basic/tasks/rados_bench.yaml | 1 + qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml | 1 + qa/suites/smoke/basic/tasks/rados_ec_snaps.yaml | 1 + 17 files changed, 17 insertions(+) diff --git a/qa/suites/big/rados-thrash/thrashers/default.yaml b/qa/suites/big/rados-thrash/thrashers/default.yaml index bcd3f39e399e2..8f2b26674bf5b 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 44c86ba6d200a..48a7a2a293c01 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 7f7298605e8c2..86b51709767bb 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 f2ccf7f069adb..9983f9ca98822 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 afc43b8d2ccb4..adaaae4bd5385 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 3095cd8e74c58..fb3af9825f282 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 c6f02b345b1d0..d70ed14e4898d 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 caa467b0e80c2..b5b240c41e4f5 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 471e4af3f72f9..86db1af54dfd9 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 e8e2007f86d32..cdbbadca3570d 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 7b55097f77b6b..bbc3dbdcd527b 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 bcd3f39e399e2..8f2b26674bf5b 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 d880d53b7d322..1f35f1bc9e315 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 6f35748c3eecd..020b60fddd033 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 0c77640f9b321..84331efa2e6e6 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 38a04979d05dc..94d2ea6b0ff93 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 32c9c767393fe..b3c956f6bf867 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: -- 2.39.5