From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 29 Oct 2020 03:23:40 +0000 (-0700)
Subject: qa: move kcephfs:thrash to fs:thrash
X-Git-Tag: v16.1.0~689^2~30
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5bbd97fac1e5e4335f7f9b6dd75e5fb25715896b;p=ceph.git

qa: move kcephfs:thrash to fs:thrash

Fixes: https://tracker.ceph.com/issues/23718
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/qa/suites/fs/thrash/overrides/thrashosds-health.yaml b/qa/suites/fs/thrash/overrides/thrashosds-health.yaml
new file mode 120000
index 000000000000..9124eb1aa29a
--- /dev/null
+++ b/qa/suites/fs/thrash/overrides/thrashosds-health.yaml
@@ -0,0 +1 @@
+.qa/tasks/thrashosds-health.yaml
\ No newline at end of file
diff --git a/qa/suites/fs/thrash/tasks/1-thrash/osd.yaml b/qa/suites/fs/thrash/tasks/1-thrash/osd.yaml
new file mode 100644
index 000000000000..d69fb1402f08
--- /dev/null
+++ b/qa/suites/fs/thrash/tasks/1-thrash/osd.yaml
@@ -0,0 +1,7 @@
+overrides:
+  ceph:
+    log-ignorelist:
+      - but it is still running
+      - objects unfound and apparently lost
+tasks:
+- thrashosds:
diff --git a/qa/suites/fs/thrash/tasks/2-workunit/.qa b/qa/suites/fs/thrash/tasks/2-workunit/.qa
new file mode 120000
index 000000000000..a602a0353e75
--- /dev/null
+++ b/qa/suites/fs/thrash/tasks/2-workunit/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/fs/thrash/tasks/2-workunit/ffsb.yaml b/qa/suites/fs/thrash/tasks/2-workunit/ffsb.yaml
new file mode 100644
index 000000000000..7e4f711a237d
--- /dev/null
+++ b/qa/suites/fs/thrash/tasks/2-workunit/ffsb.yaml
@@ -0,0 +1,13 @@
+overrides:
+  ceph:
+    log-ignorelist:
+    - SLOW_OPS
+    - slow request
+    conf:
+      osd:
+        filestore flush min: 0
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/ffsb.sh
diff --git a/qa/suites/fs/thrash/tasks/2-workunit/iozone.yaml b/qa/suites/fs/thrash/tasks/2-workunit/iozone.yaml
new file mode 100644
index 000000000000..9270f3c51e22
--- /dev/null
+++ b/qa/suites/fs/thrash/tasks/2-workunit/iozone.yaml
@@ -0,0 +1,5 @@
+tasks:
+- workunit:
+    clients:
+      all:
+        - suites/iozone.sh
diff --git a/qa/suites/kcephfs/thrash/% b/qa/suites/kcephfs/thrash/%
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/kcephfs/thrash/.qa b/qa/suites/kcephfs/thrash/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/kcephfs/thrash/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/begin.yaml b/qa/suites/kcephfs/thrash/begin.yaml
deleted file mode 120000
index 311d404f7c27..000000000000
--- a/qa/suites/kcephfs/thrash/begin.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/begin.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/clusters/.qa b/qa/suites/kcephfs/thrash/clusters/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/kcephfs/thrash/clusters/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml b/qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml
deleted file mode 120000
index 64bdb79fe7e7..000000000000
--- a/qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/clusters/1-mds-1-client.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/conf b/qa/suites/kcephfs/thrash/conf
deleted file mode 120000
index 16e8cc44b7d7..000000000000
--- a/qa/suites/kcephfs/thrash/conf
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/conf
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/kclient b/qa/suites/kcephfs/thrash/kclient
deleted file mode 120000
index 22f94e1509bc..000000000000
--- a/qa/suites/kcephfs/thrash/kclient
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/mount/kclient/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/objectstore-ec b/qa/suites/kcephfs/thrash/objectstore-ec
deleted file mode 120000
index affe294932e2..000000000000
--- a/qa/suites/kcephfs/thrash/objectstore-ec
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/objectstore-ec
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/overrides/+ b/qa/suites/kcephfs/thrash/overrides/+
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/qa/suites/kcephfs/thrash/overrides/.qa b/qa/suites/kcephfs/thrash/overrides/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/kcephfs/thrash/overrides/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/overrides/frag_enable.yaml b/qa/suites/kcephfs/thrash/overrides/frag_enable.yaml
deleted file mode 120000
index 34a39a368cf1..000000000000
--- a/qa/suites/kcephfs/thrash/overrides/frag_enable.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/frag_enable.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml b/qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml
deleted file mode 120000
index f290c749bdcb..000000000000
--- a/qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/osd-asserts.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml b/qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml
deleted file mode 120000
index 9124eb1aa29a..000000000000
--- a/qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/tasks/thrashosds-health.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/overrides/whitelist_health.yaml b/qa/suites/kcephfs/thrash/overrides/whitelist_health.yaml
deleted file mode 120000
index 74f39a49b27e..000000000000
--- a/qa/suites/kcephfs/thrash/overrides/whitelist_health.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/whitelist_health.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/kcephfs/thrash/overrides/whitelist_wrongly_marked_down.yaml
deleted file mode 120000
index b4528c0f8c09..000000000000
--- a/qa/suites/kcephfs/thrash/overrides/whitelist_wrongly_marked_down.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/thrashers/.qa b/qa/suites/kcephfs/thrash/thrashers/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/kcephfs/thrash/thrashers/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/thrashers/default.yaml b/qa/suites/kcephfs/thrash/thrashers/default.yaml
deleted file mode 100644
index d69fb1402f08..000000000000
--- a/qa/suites/kcephfs/thrash/thrashers/default.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - but it is still running
-      - objects unfound and apparently lost
-tasks:
-- thrashosds:
diff --git a/qa/suites/kcephfs/thrash/thrashers/mds.yaml b/qa/suites/kcephfs/thrash/thrashers/mds.yaml
deleted file mode 100644
index d03d4f922522..000000000000
--- a/qa/suites/kcephfs/thrash/thrashers/mds.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-      - Replacing daemon mds
-
-tasks:
-- mds_thrash:
diff --git a/qa/suites/kcephfs/thrash/thrashers/mon.yaml b/qa/suites/kcephfs/thrash/thrashers/mon.yaml
deleted file mode 100644
index 8d68152ae088..000000000000
--- a/qa/suites/kcephfs/thrash/thrashers/mon.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-    - \(MON_DOWN\)
-
-tasks:
-- mon_thrash:
-    revive_delay: 20
-    thrash_delay: 1
diff --git a/qa/suites/kcephfs/thrash/workloads/.qa b/qa/suites/kcephfs/thrash/workloads/.qa
deleted file mode 120000
index a602a0353e75..000000000000
--- a/qa/suites/kcephfs/thrash/workloads/.qa
+++ /dev/null
@@ -1 +0,0 @@
-../.qa/
\ No newline at end of file
diff --git a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml b/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml
deleted file mode 100644
index 7e4f711a237d..000000000000
--- a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-overrides:
-  ceph:
-    log-ignorelist:
-    - SLOW_OPS
-    - slow request
-    conf:
-      osd:
-        filestore flush min: 0
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/ffsb.sh
diff --git a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml b/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml
deleted file mode 100644
index 9270f3c51e22..000000000000
--- a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-tasks:
-- workunit:
-    clients:
-      all:
-        - suites/iozone.sh