From: Matan Breizman <mbreizma@redhat.com>
Date: Sun, 19 Mar 2023 11:56:03 +0000 (+0000)
Subject: qa/suites/crimson-rados/thrash: Enable supported thrashers
X-Git-Tag: v18.1.0~49^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F51636%2Fhead;p=ceph.git

qa/suites/crimson-rados/thrash: Enable supported thrashers

Balanced/Localized reads are now supported.
snap_remove and rollback are supported as well.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
(cherry picked from commit b888cfa3da956aad527d05c3dbe507efb368363f)
---

diff --git a/qa/suites/crimson-rados/thrash/workloads/pool-snaps-few-objects.yaml b/qa/suites/crimson-rados/thrash/workloads/pool-snaps-few-objects.yaml
new file mode 100644
index 000000000000..fff5cda6e82c
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/workloads/pool-snaps-few-objects.yaml
@@ -0,0 +1,20 @@
+override:
+  conf:
+    osd:
+      osd deep scrub update digest min age: 0
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    pool_snaps: true
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 0
+      # TODO: CEPH_OSD_OP_COPY_FROM
+      copy_from: 0
+
diff --git a/qa/suites/crimson-rados/thrash/workloads/pool-snaps-few-objects.yaml.disabled b/qa/suites/crimson-rados/thrash/workloads/pool-snaps-few-objects.yaml.disabled
deleted file mode 100644
index fff5cda6e82c..000000000000
--- a/qa/suites/crimson-rados/thrash/workloads/pool-snaps-few-objects.yaml.disabled
+++ /dev/null
@@ -1,20 +0,0 @@
-override:
-  conf:
-    osd:
-      osd deep scrub update digest min age: 0
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    pool_snaps: true
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 0
-      # TODO: CEPH_OSD_OP_COPY_FROM
-      copy_from: 0
-
diff --git a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-balanced.yaml b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-balanced.yaml
new file mode 100644
index 000000000000..1161c3cc2532
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-balanced.yaml
@@ -0,0 +1,15 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    balance_reads: true
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 0
+      # TODO: CEPH_OSD_OP_COPY_FROM
+      copy_from: 0
diff --git a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-balanced.yaml.disabled b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-balanced.yaml.disabled
deleted file mode 100644
index 1161c3cc2532..000000000000
--- a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-balanced.yaml.disabled
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    balance_reads: true
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 0
-      # TODO: CEPH_OSD_OP_COPY_FROM
-      copy_from: 0
diff --git a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-localized.yaml b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-localized.yaml
new file mode 100644
index 000000000000..80af0def0e48
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-localized.yaml
@@ -0,0 +1,15 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    localize_reads: true
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 0
+      # TODO: CEPH_OSD_OP_COPY_FROM
+      copy_from: 0
diff --git a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-localized.yaml.disabled b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-localized.yaml.disabled
deleted file mode 100644
index 80af0def0e48..000000000000
--- a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects-localized.yaml.disabled
+++ /dev/null
@@ -1,15 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    localize_reads: true
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 0
-      # TODO: CEPH_OSD_OP_COPY_FROM
-      copy_from: 0
diff --git a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects.yaml b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects.yaml
new file mode 100644
index 000000000000..0694ffcd0d6b
--- /dev/null
+++ b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects.yaml
@@ -0,0 +1,14 @@
+tasks:
+- rados:
+    clients: [client.0]
+    ops: 4000
+    objects: 50
+    op_weights:
+      read: 100
+      write: 100
+      delete: 50
+      snap_create: 50
+      snap_remove: 50
+      rollback: 0
+      # TODO: CEPH_OSD_OP_COPY_FROM
+      copy_from: 0
diff --git a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects.yaml.disabled b/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects.yaml.disabled
deleted file mode 100644
index 0694ffcd0d6b..000000000000
--- a/qa/suites/crimson-rados/thrash/workloads/snaps-few-objects.yaml.disabled
+++ /dev/null
@@ -1,14 +0,0 @@
-tasks:
-- rados:
-    clients: [client.0]
-    ops: 4000
-    objects: 50
-    op_weights:
-      read: 100
-      write: 100
-      delete: 50
-      snap_create: 50
-      snap_remove: 50
-      rollback: 0
-      # TODO: CEPH_OSD_OP_COPY_FROM
-      copy_from: 0