From 2afbc60be7e29206d3a409cda56afb65b1e7d2e8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 11 Jul 2017 14:01:15 -0400 Subject: [PATCH] qa/suites/: enable rados.py cache tiering ops These weren't being exercised! See http://tracker.ceph.com/issues/11793 Signed-off-by: Sage Weil --- .../rados/thrash/workloads/cache-pool-snaps-readproxy.yaml | 6 +++--- qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml | 6 +++--- qa/suites/rados/thrash/workloads/cache-snaps.yaml | 6 +++--- qa/suites/rados/thrash/workloads/cache.yaml | 6 +++--- qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml | 6 +++--- qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml | 6 +++--- .../jewel-x/parallel/2-workload/cache-pool-snaps.yaml | 6 +++--- 7 files changed, 21 insertions(+), 21 deletions(-) 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 0f5462b7b8e..007775cee07 100644 --- a/qa/suites/rados/thrash/workloads/cache-pool-snaps-readproxy.yaml +++ b/qa/suites/rados/thrash/workloads/cache-pool-snaps-readproxy.yaml @@ -25,9 +25,9 @@ tasks: write: 100 delete: 50 copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 + cache_flush: 50 + cache_try_flush: 50 + cache_evict: 50 snap_create: 50 snap_remove: 50 rollback: 50 diff --git a/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml b/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml index bf0229f22ac..a568a340265 100644 --- a/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml +++ b/qa/suites/rados/thrash/workloads/cache-pool-snaps.yaml @@ -27,9 +27,9 @@ tasks: write: 100 delete: 50 copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 + cache_flush: 50 + cache_try_flush: 50 + cache_evict: 50 snap_create: 50 snap_remove: 50 rollback: 50 diff --git a/qa/suites/rados/thrash/workloads/cache-snaps.yaml b/qa/suites/rados/thrash/workloads/cache-snaps.yaml index ee6849098ae..f4e2ffe133c 100644 --- a/qa/suites/rados/thrash/workloads/cache-snaps.yaml +++ b/qa/suites/rados/thrash/workloads/cache-snaps.yaml @@ -25,9 +25,9 @@ tasks: write: 100 delete: 50 copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 + cache_flush: 50 + cache_try_flush: 50 + cache_evict: 50 snap_create: 50 snap_remove: 50 rollback: 50 diff --git a/qa/suites/rados/thrash/workloads/cache.yaml b/qa/suites/rados/thrash/workloads/cache.yaml index 8087e1cd4b5..4c5c1b6057d 100644 --- a/qa/suites/rados/thrash/workloads/cache.yaml +++ b/qa/suites/rados/thrash/workloads/cache.yaml @@ -25,6 +25,6 @@ tasks: write: 100 delete: 50 copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 + cache_flush: 50 + cache_try_flush: 50 + cache_evict: 50 diff --git a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml index 038f7f93d51..fa593f49685 100644 --- a/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml +++ b/qa/suites/smoke/basic/tasks/rados_cache_snaps.yaml @@ -26,13 +26,13 @@ tasks: op_weights: copy_from: 50 delete: 50 - evict: 50 - flush: 50 + cache_evict: 50 + cache_flush: 50 read: 100 rollback: 50 snap_create: 50 snap_remove: 50 - try_flush: 50 + cache_try_flush: 50 write: 100 ops: 4000 pool_snaps: true diff --git a/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml b/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml index 3af3cfd7243..b2fc171cc83 100644 --- a/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml +++ b/qa/suites/upgrade/hammer-jewel-x/tiering/3-upgrade.yaml @@ -16,9 +16,9 @@ workload: write: 100 delete: 50 copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 + cache_flush: 50 + cache_try_flush: 50 + cache_evict: 50 - print: "**** done rados" upgrade-sequence: diff --git a/qa/suites/upgrade/jewel-x/parallel/2-workload/cache-pool-snaps.yaml b/qa/suites/upgrade/jewel-x/parallel/2-workload/cache-pool-snaps.yaml index 8e633e69033..dfbcbeaf65e 100644 --- a/qa/suites/upgrade/jewel-x/parallel/2-workload/cache-pool-snaps.yaml +++ b/qa/suites/upgrade/jewel-x/parallel/2-workload/cache-pool-snaps.yaml @@ -30,9 +30,9 @@ workload: write: 100 delete: 50 copy_from: 50 - flush: 50 - try_flush: 50 - evict: 50 + cache_flush: 50 + cache_try_flush: 50 + cache_evict: 50 snap_create: 50 snap_remove: 50 rollback: 50 -- 2.39.5