From: Patrick Donnelly Date: Thu, 29 Oct 2020 03:17:02 +0000 (-0700) Subject: qa: reorganize thrash tasks X-Git-Tag: v16.1.0~689^2~31 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=742d75a7fef544eecaee805c3621fd2c1469194d;p=ceph.git qa: reorganize thrash tasks Fixes: https://tracker.ceph.com/issues/23718 Signed-off-by: Patrick Donnelly --- diff --git a/qa/suites/fs/thrash/ceph-thrash/.qa b/qa/suites/fs/thrash/ceph-thrash/.qa deleted file mode 120000 index a602a0353e7..00000000000 --- a/qa/suites/fs/thrash/ceph-thrash/.qa +++ /dev/null @@ -1 +0,0 @@ -../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/ceph-thrash/mds.yaml b/qa/suites/fs/thrash/ceph-thrash/mds.yaml deleted file mode 100644 index 33748cea5cd..00000000000 --- a/qa/suites/fs/thrash/ceph-thrash/mds.yaml +++ /dev/null @@ -1,7 +0,0 @@ -tasks: -- mds_thrash: - -overrides: - ceph: - log-ignorelist: - - Replacing daemon mds diff --git a/qa/suites/fs/thrash/ceph-thrash/mon.yaml b/qa/suites/fs/thrash/ceph-thrash/mon.yaml deleted file mode 100644 index fbbe16151ce..00000000000 --- a/qa/suites/fs/thrash/ceph-thrash/mon.yaml +++ /dev/null @@ -1,10 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - overall HEALTH_ - - \(MON_DOWN\) -tasks: -- mon_thrash: - check_mds_failover: True - revive_delay: 20 - thrash_delay: 10 diff --git a/qa/suites/fs/thrash/tasks/% b/qa/suites/fs/thrash/tasks/% new file mode 100644 index 00000000000..e69de29bb2d diff --git a/qa/suites/fs/thrash/tasks/1-thrash/.qa b/qa/suites/fs/thrash/tasks/1-thrash/.qa new file mode 120000 index 00000000000..a602a0353e7 --- /dev/null +++ b/qa/suites/fs/thrash/tasks/1-thrash/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/thrash/tasks/1-thrash/mds.yaml b/qa/suites/fs/thrash/tasks/1-thrash/mds.yaml new file mode 100644 index 00000000000..33748cea5cd --- /dev/null +++ b/qa/suites/fs/thrash/tasks/1-thrash/mds.yaml @@ -0,0 +1,7 @@ +tasks: +- mds_thrash: + +overrides: + ceph: + log-ignorelist: + - Replacing daemon mds diff --git a/qa/suites/fs/thrash/tasks/1-thrash/mon.yaml b/qa/suites/fs/thrash/tasks/1-thrash/mon.yaml new file mode 100644 index 00000000000..fbbe16151ce --- /dev/null +++ b/qa/suites/fs/thrash/tasks/1-thrash/mon.yaml @@ -0,0 +1,10 @@ +overrides: + ceph: + log-ignorelist: + - overall HEALTH_ + - \(MON_DOWN\) +tasks: +- mon_thrash: + check_mds_failover: True + revive_delay: 20 + thrash_delay: 10 diff --git a/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_snaptests.yaml b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_snaptests.yaml new file mode 100644 index 00000000000..790c93c2b17 --- /dev/null +++ b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_snaptests.yaml @@ -0,0 +1,5 @@ +tasks: +- workunit: + clients: + all: + - fs/snaps diff --git a/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml new file mode 120000 index 00000000000..c2e859fffbc --- /dev/null +++ b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_fsstress.yaml @@ -0,0 +1 @@ +.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml new file mode 100644 index 00000000000..f7784383be2 --- /dev/null +++ b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_suites_pjd.yaml @@ -0,0 +1,11 @@ +overrides: + ceph: + conf: + client: + fuse set user groups: true +tasks: +- workunit: + timeout: 6h + clients: + all: + - suites/pjd.sh diff --git a/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_trivial_sync.yaml b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_trivial_sync.yaml new file mode 120000 index 00000000000..a1df032772f --- /dev/null +++ b/qa/suites/fs/thrash/tasks/2-workunit/cfuse_workunit_trivial_sync.yaml @@ -0,0 +1 @@ +.qa/cephfs/tasks/cfuse_workunit_trivial_sync.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml b/qa/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml deleted file mode 100644 index 790c93c2b17..00000000000 --- a/qa/suites/fs/thrash/tasks/cfuse_workunit_snaptests.yaml +++ /dev/null @@ -1,5 +0,0 @@ -tasks: -- workunit: - clients: - all: - - fs/snaps diff --git a/qa/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml b/qa/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml deleted file mode 120000 index c2e859fffbc..00000000000 --- a/qa/suites/fs/thrash/tasks/cfuse_workunit_suites_fsstress.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/tasks/cfuse_workunit_suites_fsstress.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml b/qa/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml deleted file mode 100644 index f7784383be2..00000000000 --- a/qa/suites/fs/thrash/tasks/cfuse_workunit_suites_pjd.yaml +++ /dev/null @@ -1,11 +0,0 @@ -overrides: - ceph: - conf: - client: - fuse set user groups: true -tasks: -- workunit: - timeout: 6h - clients: - all: - - suites/pjd.sh diff --git a/qa/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml b/qa/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml deleted file mode 120000 index a1df032772f..00000000000 --- a/qa/suites/fs/thrash/tasks/cfuse_workunit_trivial_sync.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/tasks/cfuse_workunit_trivial_sync.yaml \ No newline at end of file