From 5bbd97fac1e5e4335f7f9b6dd75e5fb25715896b Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 28 Oct 2020 20:23:40 -0700 Subject: [PATCH] qa: move kcephfs:thrash to fs:thrash Fixes: https://tracker.ceph.com/issues/23718 Signed-off-by: Patrick Donnelly --- .../thrash/overrides/thrashosds-health.yaml} | 0 .../default.yaml => fs/thrash/tasks/1-thrash/osd.yaml} | 0 .../{kcephfs/thrash => fs/thrash/tasks/2-workunit}/.qa | 0 .../thrash/tasks/2-workunit/ffsb.yaml} | 0 .../thrash/tasks/2-workunit/iozone.yaml} | 0 qa/suites/kcephfs/thrash/% | 0 qa/suites/kcephfs/thrash/begin.yaml | 1 - qa/suites/kcephfs/thrash/clusters/.qa | 1 - qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml | 1 - qa/suites/kcephfs/thrash/conf | 1 - qa/suites/kcephfs/thrash/kclient | 1 - qa/suites/kcephfs/thrash/objectstore-ec | 1 - qa/suites/kcephfs/thrash/overrides/+ | 0 qa/suites/kcephfs/thrash/overrides/.qa | 1 - qa/suites/kcephfs/thrash/overrides/frag_enable.yaml | 1 - qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml | 1 - qa/suites/kcephfs/thrash/overrides/whitelist_health.yaml | 1 - .../thrash/overrides/whitelist_wrongly_marked_down.yaml | 1 - qa/suites/kcephfs/thrash/thrashers/.qa | 1 - qa/suites/kcephfs/thrash/thrashers/mds.yaml | 7 ------- qa/suites/kcephfs/thrash/thrashers/mon.yaml | 9 --------- qa/suites/kcephfs/thrash/workloads/.qa | 1 - 22 files changed, 29 deletions(-) rename qa/suites/{kcephfs/thrash/overrides/thrash-health-whitelist.yaml => fs/thrash/overrides/thrashosds-health.yaml} (100%) rename qa/suites/{kcephfs/thrash/thrashers/default.yaml => fs/thrash/tasks/1-thrash/osd.yaml} (100%) rename qa/suites/{kcephfs/thrash => fs/thrash/tasks/2-workunit}/.qa (100%) rename qa/suites/{kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml => fs/thrash/tasks/2-workunit/ffsb.yaml} (100%) rename qa/suites/{kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml => fs/thrash/tasks/2-workunit/iozone.yaml} (100%) delete mode 100644 qa/suites/kcephfs/thrash/% delete mode 120000 qa/suites/kcephfs/thrash/begin.yaml delete mode 120000 qa/suites/kcephfs/thrash/clusters/.qa delete mode 120000 qa/suites/kcephfs/thrash/clusters/1-mds-1-client.yaml delete mode 120000 qa/suites/kcephfs/thrash/conf delete mode 120000 qa/suites/kcephfs/thrash/kclient delete mode 120000 qa/suites/kcephfs/thrash/objectstore-ec delete mode 100644 qa/suites/kcephfs/thrash/overrides/+ delete mode 120000 qa/suites/kcephfs/thrash/overrides/.qa delete mode 120000 qa/suites/kcephfs/thrash/overrides/frag_enable.yaml delete mode 120000 qa/suites/kcephfs/thrash/overrides/osd-asserts.yaml delete mode 120000 qa/suites/kcephfs/thrash/overrides/whitelist_health.yaml delete mode 120000 qa/suites/kcephfs/thrash/overrides/whitelist_wrongly_marked_down.yaml delete mode 120000 qa/suites/kcephfs/thrash/thrashers/.qa delete mode 100644 qa/suites/kcephfs/thrash/thrashers/mds.yaml delete mode 100644 qa/suites/kcephfs/thrash/thrashers/mon.yaml delete mode 120000 qa/suites/kcephfs/thrash/workloads/.qa diff --git a/qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml b/qa/suites/fs/thrash/overrides/thrashosds-health.yaml similarity index 100% rename from qa/suites/kcephfs/thrash/overrides/thrash-health-whitelist.yaml rename to qa/suites/fs/thrash/overrides/thrashosds-health.yaml diff --git a/qa/suites/kcephfs/thrash/thrashers/default.yaml b/qa/suites/fs/thrash/tasks/1-thrash/osd.yaml similarity index 100% rename from qa/suites/kcephfs/thrash/thrashers/default.yaml rename to qa/suites/fs/thrash/tasks/1-thrash/osd.yaml diff --git a/qa/suites/kcephfs/thrash/.qa b/qa/suites/fs/thrash/tasks/2-workunit/.qa similarity index 100% rename from qa/suites/kcephfs/thrash/.qa rename to qa/suites/fs/thrash/tasks/2-workunit/.qa diff --git a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml b/qa/suites/fs/thrash/tasks/2-workunit/ffsb.yaml similarity index 100% rename from qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_ffsb.yaml rename to qa/suites/fs/thrash/tasks/2-workunit/ffsb.yaml diff --git a/qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml b/qa/suites/fs/thrash/tasks/2-workunit/iozone.yaml similarity index 100% rename from qa/suites/kcephfs/thrash/workloads/kclient_workunit_suites_iozone.yaml rename to qa/suites/fs/thrash/tasks/2-workunit/iozone.yaml diff --git a/qa/suites/kcephfs/thrash/% b/qa/suites/kcephfs/thrash/% deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/qa/suites/kcephfs/thrash/begin.yaml b/qa/suites/kcephfs/thrash/begin.yaml deleted file mode 120000 index 311d404f7c2..00000000000 --- 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 a602a0353e7..00000000000 --- 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 64bdb79fe7e..00000000000 --- 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 16e8cc44b7d..00000000000 --- 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 22f94e1509b..00000000000 --- 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 affe294932e..00000000000 --- 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 e69de29bb2d..00000000000 diff --git a/qa/suites/kcephfs/thrash/overrides/.qa b/qa/suites/kcephfs/thrash/overrides/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- 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 34a39a368cf..00000000000 --- 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 f290c749bdc..00000000000 --- 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/whitelist_health.yaml b/qa/suites/kcephfs/thrash/overrides/whitelist_health.yaml deleted file mode 120000 index 74f39a49b27..00000000000 --- 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 b4528c0f8c0..00000000000 --- 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 a602a0353e7..00000000000 --- 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/mds.yaml b/qa/suites/kcephfs/thrash/thrashers/mds.yaml deleted file mode 100644 index d03d4f92252..00000000000 --- 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 8d68152ae08..00000000000 --- 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 a602a0353e7..00000000000 --- a/qa/suites/kcephfs/thrash/workloads/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file -- 2.39.5