From 375f56750b05d4622bd8cc3f857cf256bde68bcc Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 19 Jun 2019 11:15:25 -0500 Subject: [PATCH] qa/suites/rados/thrash: force normal pg log length with cache tiering When we are doing cache tiering, we are more sensitive to short PG logs because the dup op entries are not perfectly promoted from the base to the cache. See: http://tracker.ceph.com/issues/38358 http://tracker.ceph.com/issues/24320 This works around the problem by not testing short pg logs in combination with cache tiering. This works because the short_pg_log.yaml fragment sets the short log in the [global] section but the cache workloads overload it (back to a large/default value) in the [osd] section. Signed-off-by: Sage Weil (cherry picked from commit afd0b508c2e0f3dc529ba3a28fd180a3e8925646) --- qa/suites/rados/thrash/workloads/cache-agent-big.yaml | 5 +++++ qa/suites/rados/thrash/workloads/cache-agent-small.yaml | 5 +++++ .../rados/thrash/workloads/cache-pool-snaps-readproxy.yaml | 5 +++++ qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml | 5 +++++ qa/suites/rados/thrash/workloads/cache-snaps.yaml | 5 +++++ qa/suites/rados/thrash/workloads/cache.yaml | 5 +++++ 6 files changed, 30 insertions(+) diff --git a/qa/suites/rados/thrash/workloads/cache-agent-big.yaml b/qa/suites/rados/thrash/workloads/cache-agent-big.yaml index 0cef20773003..31a964d1dedf 100644 --- a/qa/suites/rados/thrash/workloads/cache-agent-big.yaml +++ b/qa/suites/rados/thrash/workloads/cache-agent-big.yaml @@ -2,6 +2,11 @@ overrides: ceph: log-whitelist: - must scrub before tier agent can activate + conf: + osd: + # override short_pg_log_entries.yaml (which sets these under [global]) + osd_min_pg_log_entries: 3000 + osd_max_pg_log_entries: 3000 tasks: - exec: client.0: diff --git a/qa/suites/rados/thrash/workloads/cache-agent-small.yaml b/qa/suites/rados/thrash/workloads/cache-agent-small.yaml index 16c8242e9b2f..f082b0b9783b 100644 --- a/qa/suites/rados/thrash/workloads/cache-agent-small.yaml +++ b/qa/suites/rados/thrash/workloads/cache-agent-small.yaml @@ -2,6 +2,11 @@ overrides: ceph: log-whitelist: - must scrub before tier agent can activate + conf: + osd: + # override short_pg_log_entries.yaml (which sets these under [global]) + osd_min_pg_log_entries: 3000 + osd_max_pg_log_entries: 3000 tasks: - exec: client.0: diff --git a/qa/suites/rados/thrash/workloads/cache-pool-snaps-readproxy.yaml b/qa/suites/rados/thrash/workloads/cache-pool-snaps-readproxy.yaml index 43497431b8d4..b84d4d9578d0 100644 --- a/qa/suites/rados/thrash/workloads/cache-pool-snaps-readproxy.yaml +++ b/qa/suites/rados/thrash/workloads/cache-pool-snaps-readproxy.yaml @@ -2,6 +2,11 @@ overrides: ceph: log-whitelist: - must scrub before tier agent can activate + conf: + osd: + # override short_pg_log_entries.yaml (which sets these under [global]) + osd_min_pg_log_entries: 3000 + osd_max_pg_log_entries: 3000 tasks: - exec: client.0: diff --git a/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml b/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml index dc3385cb9abf..8d712e866d0a 100644 --- a/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml +++ b/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml @@ -2,6 +2,11 @@ overrides: ceph: log-whitelist: - must scrub before tier agent can activate + conf: + osd: + # override short_pg_log_entries.yaml (which sets these under [global]) + osd_min_pg_log_entries: 3000 + osd_max_pg_log_entries: 3000 tasks: - exec: client.0: diff --git a/qa/suites/rados/thrash/workloads/cache-snaps.yaml b/qa/suites/rados/thrash/workloads/cache-snaps.yaml index 486d6dbfafa6..7ece997e1c2a 100644 --- a/qa/suites/rados/thrash/workloads/cache-snaps.yaml +++ b/qa/suites/rados/thrash/workloads/cache-snaps.yaml @@ -2,6 +2,11 @@ overrides: ceph: log-whitelist: - must scrub before tier agent can activate + conf: + osd: + # override short_pg_log_entries.yaml (which sets these under [global]) + osd_min_pg_log_entries: 3000 + osd_max_pg_log_entries: 3000 tasks: - exec: client.0: diff --git a/qa/suites/rados/thrash/workloads/cache.yaml b/qa/suites/rados/thrash/workloads/cache.yaml index d63018f0f741..42cfa6cb909f 100644 --- a/qa/suites/rados/thrash/workloads/cache.yaml +++ b/qa/suites/rados/thrash/workloads/cache.yaml @@ -2,6 +2,11 @@ overrides: ceph: log-whitelist: - must scrub before tier agent can activate + conf: + osd: + # override short_pg_log_entries.yaml (which sets these under [global]) + osd_min_pg_log_entries: 3000 + osd_max_pg_log_entries: 3000 tasks: - exec: client.0: -- 2.47.3