Revert "rados: Fix cache_flush, cache_try_flush, cache_evict and add hit_set_list"

cache_evict is kinda broken at the moment due to snapdir nonsense.  I'm reverting this
test for now until it's fixed so it doesn't obscure the test results.

Bug: 8629
This reverts commit 3dae48c7cd9e72af47bc76840df652c1570d7502.

diff --git a/suites/rados/thrash/workloads/cache-pool-snaps.yaml b/suites/rados/thrash/workloads/cache-pool-snaps.yaml
index db23765a8a4e056dce13f9444a43834166c04d1d..8df800b3f13a9f2c2a014c2a16616ba3c04fb169 100644 (file)
--- a/suites/rados/thrash/workloads/cache-pool-snaps.yaml
+++ b/suites/rados/thrash/workloads/cache-pool-snaps.yaml
@@ -25,10 +25,9 @@ tasks:
       write: 100
       delete: 50
       copy_from: 50
-      cache_flush: 50
-      cache_try_flush: 50
-      cache_evict: 50
-      hit_set_list: 20
+      flush: 50
+      try_flush: 50
+      evict: 50
       snap_create: 50
       snap_remove: 50
       rollback: 50

diff --git a/suites/rados/thrash/workloads/cache-snaps.yaml b/suites/rados/thrash/workloads/cache-snaps.yaml
index 5fcac89807ae8bfb982bfdf434475671ff90e784..10c98aa4382ad0d5e2020f2be7e47ac05c8447ab 100644 (file)
--- a/suites/rados/thrash/workloads/cache-snaps.yaml
+++ b/suites/rados/thrash/workloads/cache-snaps.yaml
@@ -24,10 +24,9 @@ tasks:
       write: 100
       delete: 50
       copy_from: 50
-      cache_flush: 50
-      cache_try_flush: 50
-      cache_evict: 50
-      hit_set_list: 20
+      flush: 50
+      try_flush: 50
+      evict: 50
       snap_create: 50
       snap_remove: 50
       rollback: 50

diff --git a/suites/rados/thrash/workloads/cache.yaml b/suites/rados/thrash/workloads/cache.yaml
index 716c5bb22d212a7ab7acaed9c3f45772036110db..0f15cad676395748925fb39dcbfa6aaf709d6018 100644 (file)
--- a/suites/rados/thrash/workloads/cache.yaml
+++ b/suites/rados/thrash/workloads/cache.yaml
@@ -23,7 +23,6 @@ tasks:
       write: 100
       delete: 50
       copy_from: 50
-      cache_flush: 50
-      cache_try_flush: 50
-      cache_evict: 50
-      hit_set_list: 20
+      flush: 50
+      try_flush: 50
+      evict: 50