From 73c8c900bc6e71f6ae7174709ad2ef4dc9b42982 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 29 Oct 2020 11:12:44 -0700 Subject: [PATCH] qa: merge fs:basic_functional and kcephfs:recovery These functional tests can be run with both clients. Fixes: https://tracker.ceph.com/issues/23718 Signed-off-by: Patrick Donnelly --- .../fs/basic_functional/tasks/backtrace.yaml | 5 ---- .../basic_functional/tasks/forward-scrub.yaml | 14 --------- .../tasks/journal-repair.yaml | 14 --------- .../fs/basic_functional/tasks/pool-perm.yaml | 5 ---- .../fs/basic_functional/tasks/strays.yaml | 5 ---- .../tasks/sessionmap/+ => functional/%} | 0 .../tasks/sessionmap => functional}/.qa | 0 qa/suites/fs/functional/begin.yaml | 1 + qa/suites/fs/functional/clusters/.qa | 1 + .../clusters/1-mds-4-client-coloc.yaml | 1 + qa/suites/fs/functional/conf | 1 + qa/suites/fs/functional/mount | 1 + qa/suites/fs/functional/objectstore/.qa | 1 + .../objectstore/bluestore-bitmap.yaml | 1 + .../objectstore/bluestore-ec-root.yaml | 1 + qa/suites/fs/functional/overrides/+ | 0 qa/suites/fs/functional/overrides/.qa | 1 + .../fs/functional/overrides/frag_enable.yaml | 1 + .../overrides/no_client_pidfile.yaml | 1 + .../overrides/whitelist_health.yaml | 1 + .../whitelist_wrongly_marked_down.yaml | 1 + .../fs/functional/supported-random-distros$ | 1 + qa/suites/fs/functional/tasks/.qa | 1 + .../tasks/acls.yaml} | 0 .../tasks/auto-repair.yaml | 2 -- .../functional}/tasks/backtrace.yaml | 1 - .../tasks/client-limits.yaml | 2 -- .../tasks/client-recovery.yaml | 2 -- .../tasks/damage.yaml | 2 -- .../tasks/data-scan.yaml | 2 -- .../functional}/tasks/forward-scrub.yaml | 2 -- .../functional}/tasks/journal-repair.yaml | 2 -- .../tasks/mds-flush.yaml | 1 - .../tasks/mds-full.yaml | 2 -- .../functional}/tasks/pool-perm.yaml | 1 - .../tasks}/sessionmap.yaml | 2 -- .../functional}/tasks/strays.yaml | 1 - .../cephfs/tasks/acls-kernel-client.yaml | 4 --- .../kcephfs/recovery/tasks/auto-repair.yaml | 13 --------- .../kcephfs/recovery/tasks/client-limits.yaml | 20 ------------- .../recovery/tasks/client-recovery.yaml | 15 ---------- qa/suites/kcephfs/recovery/tasks/damage.yaml | 27 ----------------- .../kcephfs/recovery/tasks/data-scan.yaml | 19 ------------ .../kcephfs/recovery/tasks/mds-flush.yaml | 5 ---- .../kcephfs/recovery/tasks/mds-full.yaml | 29 ------------------- .../kcephfs/recovery/tasks/sessionmap.yaml | 10 ------- 46 files changed, 15 insertions(+), 207 deletions(-) delete mode 100644 qa/suites/fs/basic_functional/tasks/backtrace.yaml delete mode 100644 qa/suites/fs/basic_functional/tasks/forward-scrub.yaml delete mode 100644 qa/suites/fs/basic_functional/tasks/journal-repair.yaml delete mode 100644 qa/suites/fs/basic_functional/tasks/pool-perm.yaml delete mode 100644 qa/suites/fs/basic_functional/tasks/strays.yaml rename qa/suites/fs/{basic_functional/tasks/sessionmap/+ => functional/%} (100%) rename qa/suites/fs/{basic_functional/tasks/sessionmap => functional}/.qa (100%) create mode 120000 qa/suites/fs/functional/begin.yaml create mode 120000 qa/suites/fs/functional/clusters/.qa create mode 120000 qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml create mode 120000 qa/suites/fs/functional/conf create mode 120000 qa/suites/fs/functional/mount create mode 120000 qa/suites/fs/functional/objectstore/.qa create mode 120000 qa/suites/fs/functional/objectstore/bluestore-bitmap.yaml create mode 120000 qa/suites/fs/functional/objectstore/bluestore-ec-root.yaml create mode 100644 qa/suites/fs/functional/overrides/+ create mode 120000 qa/suites/fs/functional/overrides/.qa create mode 120000 qa/suites/fs/functional/overrides/frag_enable.yaml create mode 120000 qa/suites/fs/functional/overrides/no_client_pidfile.yaml create mode 120000 qa/suites/fs/functional/overrides/whitelist_health.yaml create mode 120000 qa/suites/fs/functional/overrides/whitelist_wrongly_marked_down.yaml create mode 120000 qa/suites/fs/functional/supported-random-distros$ create mode 120000 qa/suites/fs/functional/tasks/.qa rename qa/suites/fs/{basic_functional/tasks/acls-fuse-client.yaml => functional/tasks/acls.yaml} (100%) rename qa/suites/fs/{basic_functional => functional}/tasks/auto-repair.yaml (99%) rename qa/suites/{kcephfs/recovery => fs/functional}/tasks/backtrace.yaml (98%) rename qa/suites/fs/{basic_functional => functional}/tasks/client-limits.yaml (99%) rename qa/suites/fs/{basic_functional => functional}/tasks/client-recovery.yaml (99%) rename qa/suites/fs/{basic_functional => functional}/tasks/damage.yaml (99%) rename qa/suites/fs/{basic_functional => functional}/tasks/data-scan.yaml (99%) rename qa/suites/{kcephfs/recovery => fs/functional}/tasks/forward-scrub.yaml (99%) rename qa/suites/{kcephfs/recovery => fs/functional}/tasks/journal-repair.yaml (99%) rename qa/suites/fs/{basic_functional => functional}/tasks/mds-flush.yaml (98%) rename qa/suites/fs/{basic_functional => functional}/tasks/mds-full.yaml (99%) rename qa/suites/{kcephfs/recovery => fs/functional}/tasks/pool-perm.yaml (98%) rename qa/suites/fs/{basic_functional/tasks/sessionmap => functional/tasks}/sessionmap.yaml (98%) rename qa/suites/{kcephfs/recovery => fs/functional}/tasks/strays.yaml (98%) delete mode 100644 qa/suites/kcephfs/cephfs/tasks/acls-kernel-client.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/auto-repair.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/client-limits.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/client-recovery.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/damage.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/data-scan.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/mds-flush.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/mds-full.yaml delete mode 100644 qa/suites/kcephfs/recovery/tasks/sessionmap.yaml diff --git a/qa/suites/fs/basic_functional/tasks/backtrace.yaml b/qa/suites/fs/basic_functional/tasks/backtrace.yaml deleted file mode 100644 index d740a5f6f7549..0000000000000 --- a/qa/suites/fs/basic_functional/tasks/backtrace.yaml +++ /dev/null @@ -1,5 +0,0 @@ - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_backtrace diff --git a/qa/suites/fs/basic_functional/tasks/forward-scrub.yaml b/qa/suites/fs/basic_functional/tasks/forward-scrub.yaml deleted file mode 100644 index 73090662f87ab..0000000000000 --- a/qa/suites/fs/basic_functional/tasks/forward-scrub.yaml +++ /dev/null @@ -1,14 +0,0 @@ - -overrides: - ceph: - log-ignorelist: - - inode wrongly marked free - - bad backtrace on inode - - inode table repaired for inode - - Scrub error on inode - - Metadata damage detected - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_forward_scrub diff --git a/qa/suites/fs/basic_functional/tasks/journal-repair.yaml b/qa/suites/fs/basic_functional/tasks/journal-repair.yaml deleted file mode 100644 index 71c06de0726ef..0000000000000 --- a/qa/suites/fs/basic_functional/tasks/journal-repair.yaml +++ /dev/null @@ -1,14 +0,0 @@ - -overrides: - ceph: - log-ignorelist: - - bad backtrace on directory inode - - error reading table object - - Metadata damage detected - - slow requests are blocked - - Behind on trimming - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_journal_repair diff --git a/qa/suites/fs/basic_functional/tasks/pool-perm.yaml b/qa/suites/fs/basic_functional/tasks/pool-perm.yaml deleted file mode 100644 index f220626df62fe..0000000000000 --- a/qa/suites/fs/basic_functional/tasks/pool-perm.yaml +++ /dev/null @@ -1,5 +0,0 @@ - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_pool_perm diff --git a/qa/suites/fs/basic_functional/tasks/strays.yaml b/qa/suites/fs/basic_functional/tasks/strays.yaml deleted file mode 100644 index 2809fc141bfb2..0000000000000 --- a/qa/suites/fs/basic_functional/tasks/strays.yaml +++ /dev/null @@ -1,5 +0,0 @@ - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_strays diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/+ b/qa/suites/fs/functional/% similarity index 100% rename from qa/suites/fs/basic_functional/tasks/sessionmap/+ rename to qa/suites/fs/functional/% diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/.qa b/qa/suites/fs/functional/.qa similarity index 100% rename from qa/suites/fs/basic_functional/tasks/sessionmap/.qa rename to qa/suites/fs/functional/.qa diff --git a/qa/suites/fs/functional/begin.yaml b/qa/suites/fs/functional/begin.yaml new file mode 120000 index 0000000000000..311d404f7c276 --- /dev/null +++ b/qa/suites/fs/functional/begin.yaml @@ -0,0 +1 @@ +.qa/cephfs/begin.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/clusters/.qa b/qa/suites/fs/functional/clusters/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/fs/functional/clusters/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml b/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml new file mode 120000 index 0000000000000..e5444ae226378 --- /dev/null +++ b/qa/suites/fs/functional/clusters/1-mds-4-client-coloc.yaml @@ -0,0 +1 @@ +.qa/cephfs/clusters/1-mds-4-client-coloc.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/conf b/qa/suites/fs/functional/conf new file mode 120000 index 0000000000000..16e8cc44b7d7a --- /dev/null +++ b/qa/suites/fs/functional/conf @@ -0,0 +1 @@ +.qa/cephfs/conf \ No newline at end of file diff --git a/qa/suites/fs/functional/mount b/qa/suites/fs/functional/mount new file mode 120000 index 0000000000000..e3600f453f2f3 --- /dev/null +++ b/qa/suites/fs/functional/mount @@ -0,0 +1 @@ +.qa/cephfs/mount/ \ No newline at end of file diff --git a/qa/suites/fs/functional/objectstore/.qa b/qa/suites/fs/functional/objectstore/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/fs/functional/objectstore/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/functional/objectstore/bluestore-bitmap.yaml b/qa/suites/fs/functional/objectstore/bluestore-bitmap.yaml new file mode 120000 index 0000000000000..a59cf5175069a --- /dev/null +++ b/qa/suites/fs/functional/objectstore/bluestore-bitmap.yaml @@ -0,0 +1 @@ +.qa/objectstore/bluestore-bitmap.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/objectstore/bluestore-ec-root.yaml b/qa/suites/fs/functional/objectstore/bluestore-ec-root.yaml new file mode 120000 index 0000000000000..4edebd6829d33 --- /dev/null +++ b/qa/suites/fs/functional/objectstore/bluestore-ec-root.yaml @@ -0,0 +1 @@ +.qa/cephfs/objectstore-ec/bluestore-ec-root.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/overrides/+ b/qa/suites/fs/functional/overrides/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/fs/functional/overrides/.qa b/qa/suites/fs/functional/overrides/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/fs/functional/overrides/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/functional/overrides/frag_enable.yaml b/qa/suites/fs/functional/overrides/frag_enable.yaml new file mode 120000 index 0000000000000..34a39a368cf15 --- /dev/null +++ b/qa/suites/fs/functional/overrides/frag_enable.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/frag_enable.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/overrides/no_client_pidfile.yaml b/qa/suites/fs/functional/overrides/no_client_pidfile.yaml new file mode 120000 index 0000000000000..8888f33274be3 --- /dev/null +++ b/qa/suites/fs/functional/overrides/no_client_pidfile.yaml @@ -0,0 +1 @@ +.qa/overrides/no_client_pidfile.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/overrides/whitelist_health.yaml b/qa/suites/fs/functional/overrides/whitelist_health.yaml new file mode 120000 index 0000000000000..74f39a49b27ed --- /dev/null +++ b/qa/suites/fs/functional/overrides/whitelist_health.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/whitelist_health.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/overrides/whitelist_wrongly_marked_down.yaml b/qa/suites/fs/functional/overrides/whitelist_wrongly_marked_down.yaml new file mode 120000 index 0000000000000..b4528c0f8c096 --- /dev/null +++ b/qa/suites/fs/functional/overrides/whitelist_wrongly_marked_down.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml \ No newline at end of file diff --git a/qa/suites/fs/functional/supported-random-distros$ b/qa/suites/fs/functional/supported-random-distros$ new file mode 120000 index 0000000000000..0862b4457b37a --- /dev/null +++ b/qa/suites/fs/functional/supported-random-distros$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/fs/functional/tasks/.qa b/qa/suites/fs/functional/tasks/.qa new file mode 120000 index 0000000000000..a602a0353e751 --- /dev/null +++ b/qa/suites/fs/functional/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/fs/basic_functional/tasks/acls-fuse-client.yaml b/qa/suites/fs/functional/tasks/acls.yaml similarity index 100% rename from qa/suites/fs/basic_functional/tasks/acls-fuse-client.yaml rename to qa/suites/fs/functional/tasks/acls.yaml diff --git a/qa/suites/fs/basic_functional/tasks/auto-repair.yaml b/qa/suites/fs/functional/tasks/auto-repair.yaml similarity index 99% rename from qa/suites/fs/basic_functional/tasks/auto-repair.yaml rename to qa/suites/fs/functional/tasks/auto-repair.yaml index c401ffd1b3211..1a3ff3efbc651 100644 --- a/qa/suites/fs/basic_functional/tasks/auto-repair.yaml +++ b/qa/suites/fs/functional/tasks/auto-repair.yaml @@ -5,8 +5,6 @@ overrides: - bad backtrace - MDS in read-only mode - \(MDS_READ_ONLY\) - - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/kcephfs/recovery/tasks/backtrace.yaml b/qa/suites/fs/functional/tasks/backtrace.yaml similarity index 98% rename from qa/suites/kcephfs/recovery/tasks/backtrace.yaml rename to qa/suites/fs/functional/tasks/backtrace.yaml index d740a5f6f7549..6d80c32cce98b 100644 --- a/qa/suites/kcephfs/recovery/tasks/backtrace.yaml +++ b/qa/suites/fs/functional/tasks/backtrace.yaml @@ -1,4 +1,3 @@ - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/fs/basic_functional/tasks/client-limits.yaml b/qa/suites/fs/functional/tasks/client-limits.yaml similarity index 99% rename from qa/suites/fs/basic_functional/tasks/client-limits.yaml rename to qa/suites/fs/functional/tasks/client-limits.yaml index e1ea5c157f99d..4055f15acaa5d 100644 --- a/qa/suites/fs/basic_functional/tasks/client-limits.yaml +++ b/qa/suites/fs/functional/tasks/client-limits.yaml @@ -1,4 +1,3 @@ - overrides: ceph: log-ignorelist: @@ -12,7 +11,6 @@ overrides: - MDS cache is too large - \(MDS_CLIENT_OLDEST_TID\) - \(MDS_CACHE_OVERSIZED\) - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/fs/basic_functional/tasks/client-recovery.yaml b/qa/suites/fs/functional/tasks/client-recovery.yaml similarity index 99% rename from qa/suites/fs/basic_functional/tasks/client-recovery.yaml rename to qa/suites/fs/functional/tasks/client-recovery.yaml index cdbbb31ee3fe9..d927fd11b6c7b 100644 --- a/qa/suites/fs/basic_functional/tasks/client-recovery.yaml +++ b/qa/suites/fs/functional/tasks/client-recovery.yaml @@ -1,4 +1,3 @@ - # The task interferes with the network, so we need # to permit OSDs to complain about that. overrides: @@ -9,7 +8,6 @@ overrides: - slow request - MDS_CLIENT_LATE_RELEASE - t responding to mclientcaps - tasks: - cephfs_test_runner: fail_on_skip: false diff --git a/qa/suites/fs/basic_functional/tasks/damage.yaml b/qa/suites/fs/functional/tasks/damage.yaml similarity index 99% rename from qa/suites/fs/basic_functional/tasks/damage.yaml rename to qa/suites/fs/functional/tasks/damage.yaml index 16d56ee2f3627..917c4b1a3d63e 100644 --- a/qa/suites/fs/basic_functional/tasks/damage.yaml +++ b/qa/suites/fs/functional/tasks/damage.yaml @@ -1,4 +1,3 @@ - overrides: ceph: log-ignorelist: @@ -19,7 +18,6 @@ overrides: - Metadata damage detected - MDS_READ_ONLY - force file system read-only - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/fs/basic_functional/tasks/data-scan.yaml b/qa/suites/fs/functional/tasks/data-scan.yaml similarity index 99% rename from qa/suites/fs/basic_functional/tasks/data-scan.yaml rename to qa/suites/fs/functional/tasks/data-scan.yaml index c720d3d7f354e..b704a0036499e 100644 --- a/qa/suites/fs/basic_functional/tasks/data-scan.yaml +++ b/qa/suites/fs/functional/tasks/data-scan.yaml @@ -1,4 +1,3 @@ - overrides: ceph: log-ignorelist: @@ -13,7 +12,6 @@ overrides: - Metadata damage detected - inconsistent rstat on inode - Error recovering journal - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/kcephfs/recovery/tasks/forward-scrub.yaml b/qa/suites/fs/functional/tasks/forward-scrub.yaml similarity index 99% rename from qa/suites/kcephfs/recovery/tasks/forward-scrub.yaml rename to qa/suites/fs/functional/tasks/forward-scrub.yaml index 73090662f87ab..f444455f1fef6 100644 --- a/qa/suites/kcephfs/recovery/tasks/forward-scrub.yaml +++ b/qa/suites/fs/functional/tasks/forward-scrub.yaml @@ -1,4 +1,3 @@ - overrides: ceph: log-ignorelist: @@ -7,7 +6,6 @@ overrides: - inode table repaired for inode - Scrub error on inode - Metadata damage detected - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/kcephfs/recovery/tasks/journal-repair.yaml b/qa/suites/fs/functional/tasks/journal-repair.yaml similarity index 99% rename from qa/suites/kcephfs/recovery/tasks/journal-repair.yaml rename to qa/suites/fs/functional/tasks/journal-repair.yaml index 71c06de0726ef..d6f87f871bafc 100644 --- a/qa/suites/kcephfs/recovery/tasks/journal-repair.yaml +++ b/qa/suites/fs/functional/tasks/journal-repair.yaml @@ -1,4 +1,3 @@ - overrides: ceph: log-ignorelist: @@ -7,7 +6,6 @@ overrides: - Metadata damage detected - slow requests are blocked - Behind on trimming - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/fs/basic_functional/tasks/mds-flush.yaml b/qa/suites/fs/functional/tasks/mds-flush.yaml similarity index 98% rename from qa/suites/fs/basic_functional/tasks/mds-flush.yaml rename to qa/suites/fs/functional/tasks/mds-flush.yaml index d59a8ad5fc941..be8c4bee65b99 100644 --- a/qa/suites/fs/basic_functional/tasks/mds-flush.yaml +++ b/qa/suites/fs/functional/tasks/mds-flush.yaml @@ -1,4 +1,3 @@ - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/fs/basic_functional/tasks/mds-full.yaml b/qa/suites/fs/functional/tasks/mds-full.yaml similarity index 99% rename from qa/suites/fs/basic_functional/tasks/mds-full.yaml rename to qa/suites/fs/functional/tasks/mds-full.yaml index 9ddccf83703d6..d00dd9bbcc924 100644 --- a/qa/suites/fs/basic_functional/tasks/mds-full.yaml +++ b/qa/suites/fs/functional/tasks/mds-full.yaml @@ -1,4 +1,3 @@ - overrides: ceph: cephfs_ec_profile: @@ -30,7 +29,6 @@ overrides: debug client: 20 debug objecter: 20 debug objectcacher: 20 - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/kcephfs/recovery/tasks/pool-perm.yaml b/qa/suites/fs/functional/tasks/pool-perm.yaml similarity index 98% rename from qa/suites/kcephfs/recovery/tasks/pool-perm.yaml rename to qa/suites/fs/functional/tasks/pool-perm.yaml index f220626df62fe..41392fe51a4dc 100644 --- a/qa/suites/kcephfs/recovery/tasks/pool-perm.yaml +++ b/qa/suites/fs/functional/tasks/pool-perm.yaml @@ -1,4 +1,3 @@ - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml b/qa/suites/fs/functional/tasks/sessionmap.yaml similarity index 98% rename from qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml rename to qa/suites/fs/functional/tasks/sessionmap.yaml index 900fb4ecd40db..3f66f32ab81f7 100644 --- a/qa/suites/fs/basic_functional/tasks/sessionmap/sessionmap.yaml +++ b/qa/suites/fs/functional/tasks/sessionmap.yaml @@ -1,9 +1,7 @@ - overrides: ceph: log-ignorelist: - client session with non-allowable root - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/kcephfs/recovery/tasks/strays.yaml b/qa/suites/fs/functional/tasks/strays.yaml similarity index 98% rename from qa/suites/kcephfs/recovery/tasks/strays.yaml rename to qa/suites/fs/functional/tasks/strays.yaml index 2809fc141bfb2..3866ce510f3d1 100644 --- a/qa/suites/kcephfs/recovery/tasks/strays.yaml +++ b/qa/suites/fs/functional/tasks/strays.yaml @@ -1,4 +1,3 @@ - tasks: - cephfs_test_runner: modules: diff --git a/qa/suites/kcephfs/cephfs/tasks/acls-kernel-client.yaml b/qa/suites/kcephfs/cephfs/tasks/acls-kernel-client.yaml deleted file mode 100644 index 6e27010424701..0000000000000 --- a/qa/suites/kcephfs/cephfs/tasks/acls-kernel-client.yaml +++ /dev/null @@ -1,4 +0,0 @@ -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_acls diff --git a/qa/suites/kcephfs/recovery/tasks/auto-repair.yaml b/qa/suites/kcephfs/recovery/tasks/auto-repair.yaml deleted file mode 100644 index c401ffd1b3211..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/auto-repair.yaml +++ /dev/null @@ -1,13 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - force file system read-only - - bad backtrace - - MDS in read-only mode - - \(MDS_READ_ONLY\) - - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_auto_repair diff --git a/qa/suites/kcephfs/recovery/tasks/client-limits.yaml b/qa/suites/kcephfs/recovery/tasks/client-limits.yaml deleted file mode 100644 index 9bbe92f2ab420..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/client-limits.yaml +++ /dev/null @@ -1,20 +0,0 @@ - -overrides: - ceph: - log-ignorelist: - - responding to mclientcaps\(revoke\) - - not advance its oldest_client_tid - - failing to advance its oldest client/flush tid - - Too many inodes in cache - - failing to respond to cache pressure - - slow requests are blocked - - failing to respond to capability release - - MDS cache is too large - - \(MDS_CLIENT_OLDEST_TID\) - - \(MDS_CACHE_OVERSIZED\) - -tasks: - - cephfs_test_runner: - fail_on_skip: false - modules: - - tasks.cephfs.test_client_limits diff --git a/qa/suites/kcephfs/recovery/tasks/client-recovery.yaml b/qa/suites/kcephfs/recovery/tasks/client-recovery.yaml deleted file mode 100644 index 27f1a23522945..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/client-recovery.yaml +++ /dev/null @@ -1,15 +0,0 @@ - -# The task interferes with the network, so we need -# to permit OSDs to complain about that. -overrides: - ceph: - log-ignorelist: - - but it is still running - - slow request - - evicting unresponsive client - -tasks: - - cephfs_test_runner: - fail_on_skip: false - modules: - - tasks.cephfs.test_client_recovery diff --git a/qa/suites/kcephfs/recovery/tasks/damage.yaml b/qa/suites/kcephfs/recovery/tasks/damage.yaml deleted file mode 100644 index 16d56ee2f3627..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/damage.yaml +++ /dev/null @@ -1,27 +0,0 @@ - -overrides: - ceph: - log-ignorelist: - - bad backtrace - - object missing on disk - - error reading table object - - error reading sessionmap - - Error loading MDS rank - - missing journal object - - Error recovering journal - - error decoding table object - - failed to read JournalPointer - - Corrupt directory entry - - Corrupt fnode header - - corrupt sessionmap header - - Corrupt dentry - - Scrub error on inode - - Metadata damage detected - - MDS_READ_ONLY - - force file system read-only - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_damage - diff --git a/qa/suites/kcephfs/recovery/tasks/data-scan.yaml b/qa/suites/kcephfs/recovery/tasks/data-scan.yaml deleted file mode 100644 index 016faea125a40..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/data-scan.yaml +++ /dev/null @@ -1,19 +0,0 @@ - -overrides: - ceph: - log-ignorelist: - - bad backtrace - - object missing on disk - - error reading table object - - error reading sessionmap - - unmatched fragstat - - was unreadable, recreating it now - - Scrub error on inode - - Metadata damage detected - - inconsistent rstat on inode - - Error recovering journal - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_data_scan diff --git a/qa/suites/kcephfs/recovery/tasks/mds-flush.yaml b/qa/suites/kcephfs/recovery/tasks/mds-flush.yaml deleted file mode 100644 index d59a8ad5fc941..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/mds-flush.yaml +++ /dev/null @@ -1,5 +0,0 @@ - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_flush diff --git a/qa/suites/kcephfs/recovery/tasks/mds-full.yaml b/qa/suites/kcephfs/recovery/tasks/mds-full.yaml deleted file mode 100644 index c1d24db5ccccf..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/mds-full.yaml +++ /dev/null @@ -1,29 +0,0 @@ - -overrides: - ceph: - cephfs_ec_profile: - - disabled - log-ignorelist: - - OSD full dropping all updates - - OSD near full - - pausewr flag - - failsafe engaged, dropping updates - - failsafe disengaged, no longer dropping - - is full \(reached quota - - POOL_FULL - - POOL_BACKFILLFULL - conf: - mon: - mon osd nearfull ratio: 0.6 - mon osd backfillfull ratio: 0.6 - mon osd full ratio: 0.7 - osd: - osd mon report interval: 5 - osd objectstore: memstore - osd failsafe full ratio: 1.0 - memstore device bytes: 200000000 - -tasks: - - cephfs_test_runner: - modules: - - tasks.cephfs.test_full diff --git a/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml b/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml deleted file mode 100644 index d0be7b75dbcff..0000000000000 --- a/qa/suites/kcephfs/recovery/tasks/sessionmap.yaml +++ /dev/null @@ -1,10 +0,0 @@ -overrides: - ceph: - log-ignorelist: - - client session with non-allowable root - -tasks: - - cephfs_test_runner: - fail_on_skip: false - modules: - - tasks.cephfs.test_sessionmap -- 2.39.5