From 80038f50b2e07e9eddb069995b444ca19081480c Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 15 May 2017 10:22:25 -0400 Subject: [PATCH] qa/suites/rados/threas-erasure-code-*: fix luminous facet Signed-off-by: Sage Weil --- qa/suites/rados/thrash-erasure-code-big/ceph.yaml | 1 + .../rados/thrash-erasure-code-big/d-require-luminous | 1 + .../thrash-erasure-code-big/thrashers/default.yaml | 6 +++--- .../thrash-erasure-code-big/thrashers/fastread.yaml | 6 +++--- .../thrash-erasure-code-big/thrashers/mapgap.yaml | 10 ++++------ .../thrash-erasure-code-big/thrashers/morepggrow.yaml | 6 +++--- .../thrash-erasure-code-big/thrashers/pggrow.yaml | 6 +++--- .../rados/thrash-erasure-code-isa/d-require-luminous | 1 + qa/suites/rados/thrash-erasure-code-shec/ceph.yaml | 1 + .../rados/thrash-erasure-code-shec/d-require-luminous | 1 + .../thrash-erasure-code-shec/thrashers/default.yaml | 6 +++--- 11 files changed, 24 insertions(+), 21 deletions(-) create mode 120000 qa/suites/rados/thrash-erasure-code-big/ceph.yaml create mode 120000 qa/suites/rados/thrash-erasure-code-big/d-require-luminous create mode 120000 qa/suites/rados/thrash-erasure-code-isa/d-require-luminous create mode 120000 qa/suites/rados/thrash-erasure-code-shec/ceph.yaml create mode 120000 qa/suites/rados/thrash-erasure-code-shec/d-require-luminous diff --git a/qa/suites/rados/thrash-erasure-code-big/ceph.yaml b/qa/suites/rados/thrash-erasure-code-big/ceph.yaml new file mode 120000 index 0000000000000..a2fd139cbffb7 --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code-big/ceph.yaml @@ -0,0 +1 @@ +../thrash/ceph.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-big/d-require-luminous b/qa/suites/rados/thrash-erasure-code-big/d-require-luminous new file mode 120000 index 0000000000000..737aee82415f3 --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code-big/d-require-luminous @@ -0,0 +1 @@ +../thrash/d-require-luminous/ \ No newline at end of file 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 5acfcc3ddd969..057a7ecdb6d03 100644 --- a/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml +++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/default.yaml @@ -1,6 +1,5 @@ -tasks: -- install: -- ceph: +overrides: + ceph: log-whitelist: - wrongly marked me down - objects unfound and apparently lost @@ -11,6 +10,7 @@ tasks: osd scrub min interval: 60 osd scrub max interval: 120 osd max backfills: 6 +tasks: - thrashosds: timeout: 1200 chance_pgnum_grow: 1 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 5ded6ba7148d8..ec889775e9e71 100644 --- a/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml +++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/fastread.yaml @@ -1,6 +1,5 @@ -tasks: -- install: -- ceph: +overrides: + ceph: log-whitelist: - wrongly marked me down - objects unfound and apparently lost @@ -12,6 +11,7 @@ tasks: osd scrub min interval: 60 osd scrub max interval: 120 osd max backfills: 2 +tasks: - thrashosds: timeout: 1200 chance_pgnum_grow: 1 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 67720febbcbb0..5e93ac08fd0a7 100644 --- a/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml +++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/mapgap.yaml @@ -1,5 +1,9 @@ overrides: ceph: + log-whitelist: + - wrongly marked me down + - objects unfound and apparently lost + - osd_map_cache_size conf: mon: mon min osdmap epochs: 2 @@ -8,12 +12,6 @@ overrides: osd scrub min interval: 60 osd scrub max interval: 120 tasks: -- install: -- ceph: - log-whitelist: - - wrongly marked me down - - objects unfound and apparently lost - - osd_map_cache_size - thrashosds: timeout: 1800 chance_pgnum_grow: 1 diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml index f09ec08cfa9c8..efda9161e430a 100644 --- a/qa/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml +++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/morepggrow.yaml @@ -1,6 +1,5 @@ -tasks: -- install: -- ceph: +overrides: + ceph: conf: osd: osd scrub min interval: 60 @@ -9,6 +8,7 @@ tasks: log-whitelist: - wrongly marked me down - objects unfound and apparently lost +tasks: - thrashosds: timeout: 1200 chance_pgnum_grow: 3 diff --git a/qa/suites/rados/thrash-erasure-code-big/thrashers/pggrow.yaml b/qa/suites/rados/thrash-erasure-code-big/thrashers/pggrow.yaml index 1117cddfc1db3..772f2093c94e6 100644 --- a/qa/suites/rados/thrash-erasure-code-big/thrashers/pggrow.yaml +++ b/qa/suites/rados/thrash-erasure-code-big/thrashers/pggrow.yaml @@ -1,6 +1,5 @@ -tasks: -- install: -- ceph: +overrides: + ceph: log-whitelist: - wrongly marked me down - objects unfound and apparently lost @@ -8,6 +7,7 @@ tasks: osd: osd scrub min interval: 60 osd scrub max interval: 120 +tasks: - thrashosds: timeout: 1200 chance_pgnum_grow: 2 diff --git a/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous b/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous new file mode 120000 index 0000000000000..737aee82415f3 --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code-isa/d-require-luminous @@ -0,0 +1 @@ +../thrash/d-require-luminous/ \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-shec/ceph.yaml b/qa/suites/rados/thrash-erasure-code-shec/ceph.yaml new file mode 120000 index 0000000000000..a2fd139cbffb7 --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code-shec/ceph.yaml @@ -0,0 +1 @@ +../thrash/ceph.yaml \ No newline at end of file diff --git a/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous b/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous new file mode 120000 index 0000000000000..737aee82415f3 --- /dev/null +++ b/qa/suites/rados/thrash-erasure-code-shec/d-require-luminous @@ -0,0 +1 @@ +../thrash/d-require-luminous/ \ No newline at end of file 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 2bece1f939be4..5bff561a9fde2 100644 --- a/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml +++ b/qa/suites/rados/thrash-erasure-code-shec/thrashers/default.yaml @@ -1,6 +1,5 @@ -tasks: -- install: -- ceph: +overrides: + ceph: log-whitelist: - wrongly marked me down - objects unfound and apparently lost @@ -11,6 +10,7 @@ tasks: osd scrub min interval: 60 osd scrub max interval: 120 osd max backfills: 3 +tasks: - thrashosds: timeout: 1200 chance_pgnum_grow: 1 -- 2.47.3