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 <sage@redhat.com>

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 0f5462b7b8e95aeb3f398b8425dba10b9af05b75..007775cee074a6beb9e92311e2f54a5c01264e96 100644 (file)
--- 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 bf0229f22acdefa93034689a0ee5d24a8e768350..a568a340265fda75806610a88191f1662c2a2738 100644 (file)
--- 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 ee6849098ae4306f8213d66afe0ab0f47e2cde8a..f4e2ffe133cb1265eb6bdfe3acd15a36eadb6e90 100644 (file)
--- 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 8087e1cd4b515337599984a4e0478f36f0c7c893..4c5c1b6057d4decc8ed8066545524c4916d23aa5 100644 (file)
--- 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 038f7f93d51037bbd8b3fa2cc69d30d581a94408..fa593f496850b6fc97607749547104757feb48a7 100644 (file)
--- 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 3af3cfd724375e9d93f6c0a1c226ffdade20cf32..b2fc171cc836bea462215fe929fee91c7a4ac212 100644 (file)
--- 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 8e633e69033819d5df91de681c9ac88b6e28e6e3..dfbcbeaf65eee111e3e16af042ce46f936b08654 100644 (file)
--- 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