diff --git a/src/tests/ftest/aggregation/punching.py b/src/tests/ftest/aggregation/punching.py index b95484a778b..8e12b466aef 100644 --- a/src/tests/ftest/aggregation/punching.py +++ b/src/tests/ftest/aggregation/punching.py @@ -1,5 +1,6 @@ """ (C) Copyright 2020-2023 Intel Corporation. + (C) Copyright 2026 Hewlett Packard Enterprise Development LP SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -29,8 +30,8 @@ def test_aggregation_punching(self): :avocado: tags=all,pr,daily_regression :avocado: tags=hw,medium - :avocado: tags=aggregation,mdtest,mdtest - :avocado: tags=AggregationPunching,aggregatepunching,test_aggregation_punching + :avocado: tags=aggregation,mdtest + :avocado: tags=AggregationPunching,test_aggregation_punching """ if self.pool is None: self.add_pool(connect=False) diff --git a/src/tests/ftest/aggregation/punching.yaml b/src/tests/ftest/aggregation/punching.yaml index 063e70e34cd..a7ab56d903f 100644 --- a/src/tests/ftest/aggregation/punching.yaml +++ b/src/tests/ftest/aggregation/punching.yaml @@ -27,7 +27,6 @@ mdtest: client_processes: np: 2 test_dir: "/" - dfs_destroy: false iteration: 1 manager: "MPICH" mdtest_params: diff --git a/src/tests/ftest/datamover/large_dir.yaml b/src/tests/ftest/datamover/large_dir.yaml index dcad40f8ad8..b50c0d95484 100644 --- a/src/tests/ftest/datamover/large_dir.yaml +++ b/src/tests/ftest/datamover/large_dir.yaml @@ -26,14 +26,12 @@ pool: container: type: POSIX - control_method: daos mdtest: client_ppn: dcp: 32 api: DFS test_dir: "/" - dfs_destroy: false manager: "MPICH" dfs_oclass: EC_4P2G1 dfs_dir_oclass: RP_3GX diff --git a/src/tests/ftest/datamover/obj_large_posix.yaml b/src/tests/ftest/datamover/obj_large_posix.yaml index 245883e765b..1fcc0ae20bd 100644 --- a/src/tests/ftest/datamover/obj_large_posix.yaml +++ b/src/tests/ftest/datamover/obj_large_posix.yaml @@ -32,8 +32,9 @@ mdtest: client_processes: np: 30 api: DFS + dfs_oclass: S1 + dfs_dir_oclass: SX test_dir: "/" - dfs_destroy: false manager: "MPICH" num_of_files_dirs: 1667 # total 50K files and 50K dirs mdtest_flags: diff --git a/src/tests/ftest/datamover/serial_large_posix.yaml b/src/tests/ftest/datamover/serial_large_posix.yaml index 2f587af3b46..f813a6df3af 100644 --- a/src/tests/ftest/datamover/serial_large_posix.yaml +++ b/src/tests/ftest/datamover/serial_large_posix.yaml @@ -32,8 +32,9 @@ mdtest: client_processes: np: 30 api: DFS + dfs_oclass: S1 + dfs_dir_oclass: SX test_dir: "/" - dfs_destroy: false manager: "MPICH" num_of_files_dirs: 1667 # total 50K files and 50K dirs mdtest_flags: diff --git a/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml b/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml index 39459319e7f..b8f5fa4afc4 100644 --- a/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml +++ b/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml @@ -53,7 +53,6 @@ mdtest: np: 4 api: DFS test_dir: / - dfs_destroy: False manager: MPICH flags: "-u -F -C" write_bytes: 524288 diff --git a/src/tests/ftest/io/large_file_count.yaml b/src/tests/ftest/io/large_file_count.yaml index ec58a4ad3b3..e3fe747806a 100644 --- a/src/tests/ftest/io/large_file_count.yaml +++ b/src/tests/ftest/io/large_file_count.yaml @@ -58,7 +58,6 @@ mdtest: np: 30 num_of_files_dirs: 33334 # creating total of 1M files test_dir: "/" - dfs_destroy: false manager: "MPICH" flags: "-F -C" write_bytes: 4096 diff --git a/src/tests/ftest/io/small_file_count.yaml b/src/tests/ftest/io/small_file_count.yaml index 2a33a3ef934..b5cd440dd5e 100644 --- a/src/tests/ftest/io/small_file_count.yaml +++ b/src/tests/ftest/io/small_file_count.yaml @@ -58,8 +58,6 @@ mdtest: np: 30 num_of_files_dirs: 1667 # creating total of 50K files test_dir: "/" - iteration: 1 - dfs_destroy: false manager: "MPICH" flags: "-F -C" write_bytes: 4096 diff --git a/src/tests/ftest/mdtest/small.yaml b/src/tests/ftest/mdtest/small.yaml index e7f76cd9dd4..49864f7710b 100644 --- a/src/tests/ftest/mdtest/small.yaml +++ b/src/tests/ftest/mdtest/small.yaml @@ -41,6 +41,7 @@ mdtest: ppn: 32 dfs_oclass: S1 dfs_dir_oclass: SX + dfs_destroy: True test_dir: "/" manager: "MPICH" mdtest_params: diff --git a/src/tests/ftest/osa/offline_drain.yaml b/src/tests/ftest/osa/offline_drain.yaml index c6bef346211..ab17208fc4a 100644 --- a/src/tests/ftest/osa/offline_drain.yaml +++ b/src/tests/ftest/osa/offline_drain.yaml @@ -81,8 +81,6 @@ mdtest: np: 30 num_of_files_dirs: 4067 # creating total of 120K files test_dir: "/" - iteration: 1 - dfs_destroy: false dfs_oclass: RP_3G6 manager: "MPICH" flags: "-u" diff --git a/src/tests/ftest/osa/offline_extend.yaml b/src/tests/ftest/osa/offline_extend.yaml index ed8d1191462..a5dd0348b9a 100644 --- a/src/tests/ftest/osa/offline_extend.yaml +++ b/src/tests/ftest/osa/offline_extend.yaml @@ -68,8 +68,6 @@ mdtest: np: 2 num_of_files_dirs: 100 test_dir: "/" - iteration: 1 - dfs_destroy: false dfs_oclass: RP_2G1 dfs_dir_oclass: RP_2G1 manager: "MPICH" diff --git a/src/tests/ftest/osa/offline_parallel_test.yaml b/src/tests/ftest/osa/offline_parallel_test.yaml index 51096f07911..393e2af88b1 100644 --- a/src/tests/ftest/osa/offline_parallel_test.yaml +++ b/src/tests/ftest/osa/offline_parallel_test.yaml @@ -67,8 +67,6 @@ mdtest: np: 2 num_of_files_dirs: 100 test_dir: "/" - iteration: 1 - dfs_destroy: false dfs_oclass: RP_2G8 dfs_dir_oclass: RP_2G8 manager: "MPICH" diff --git a/src/tests/ftest/osa/offline_reintegration.yaml b/src/tests/ftest/osa/offline_reintegration.yaml index eb72bab82e4..ddca2f23e18 100644 --- a/src/tests/ftest/osa/offline_reintegration.yaml +++ b/src/tests/ftest/osa/offline_reintegration.yaml @@ -80,8 +80,6 @@ mdtest: np: 2 num_of_files_dirs: 100 test_dir: "/" - iteration: 1 - dfs_destroy: false dfs_oclass: RP_3G6 dfs_dir_oclass: RP_3G6 manager: "MPICH" diff --git a/src/tests/ftest/osa/online_drain.yaml b/src/tests/ftest/osa/online_drain.yaml index 7a584a5efc0..2f46b283f0a 100644 --- a/src/tests/ftest/osa/online_drain.yaml +++ b/src/tests/ftest/osa/online_drain.yaml @@ -67,7 +67,6 @@ mdtest: num_of_files_dirs: 100 test_dir: "/tmp/" iteration: 10 - dfs_destroy: false dfs_oclass: RP_2G4 dfs_dir_oclass: RP_2G4 manager: "MPICH" diff --git a/src/tests/ftest/osa/online_extend.yaml b/src/tests/ftest/osa/online_extend.yaml index 2e789c59724..2224177be92 100644 --- a/src/tests/ftest/osa/online_extend.yaml +++ b/src/tests/ftest/osa/online_extend.yaml @@ -78,7 +78,6 @@ mdtest: num_of_files_dirs: 100 test_dir: "/tmp/" iteration: 10 - dfs_destroy: false dfs_oclass: RP_2G1 dfs_dir_oclass: RP_2G1 manager: "MPICH" diff --git a/src/tests/ftest/osa/online_reintegration.yaml b/src/tests/ftest/osa/online_reintegration.yaml index aab63f02df7..af79f74ff14 100644 --- a/src/tests/ftest/osa/online_reintegration.yaml +++ b/src/tests/ftest/osa/online_reintegration.yaml @@ -71,8 +71,6 @@ mdtest: np: 2 num_of_files_dirs: 100 test_dir: "/tmp/" - iteration: 1 - dfs_destroy: false dfs_oclass: RP_2G1 dfs_dir_oclass: RP_2G1 manager: "MPICH" diff --git a/src/tests/ftest/performance/mdtest_easy.yaml b/src/tests/ftest/performance/mdtest_easy.yaml index 01444ec8519..8b70c5723a4 100644 --- a/src/tests/ftest/performance/mdtest_easy.yaml +++ b/src/tests/ftest/performance/mdtest_easy.yaml @@ -43,7 +43,6 @@ mdtest: &mdtest_base num_of_files_dirs: 100000000 stonewall_timer: 30 stonewall_statusfile: stoneWallingStatusFile - dfs_destroy: false mdtest_s1: &mdtest_s1 <<: *mdtest_base diff --git a/src/tests/ftest/performance/mdtest_hard.yaml b/src/tests/ftest/performance/mdtest_hard.yaml index f5c49502f58..505ecb49bd8 100644 --- a/src/tests/ftest/performance/mdtest_hard.yaml +++ b/src/tests/ftest/performance/mdtest_hard.yaml @@ -43,7 +43,6 @@ mdtest: &mdtest_base num_of_files_dirs: 100000000 stonewall_timer: 30 stonewall_statusfile: stoneWallingStatusFile - dfs_destroy: false mdtest_s1: &mdtest_s1 <<: *mdtest_base diff --git a/src/tests/ftest/pool/eviction_metrics.yaml b/src/tests/ftest/pool/eviction_metrics.yaml index f9026a02b9c..2bd057d7dd1 100644 --- a/src/tests/ftest/pool/eviction_metrics.yaml +++ b/src/tests/ftest/pool/eviction_metrics.yaml @@ -31,7 +31,6 @@ container: mdtest: dfs_oclass: S1 dfs_dir_oclass: SX - dfs_destroy: False manager: "MPICH" ppn: 32 test_dir: "/" diff --git a/src/tests/ftest/pool/verify_dtx.yaml b/src/tests/ftest/pool/verify_dtx.yaml index e0947402b6b..6ba56a048f9 100644 --- a/src/tests/ftest/pool/verify_dtx.yaml +++ b/src/tests/ftest/pool/verify_dtx.yaml @@ -33,7 +33,6 @@ container: type: POSIX mdtest: - dfs_destroy: False manager: "MPICH" ppn: 32 test_dir: "/" diff --git a/src/tests/ftest/rebuild/mdtest.yaml b/src/tests/ftest/rebuild/mdtest.yaml index 07d11c38d12..e0c921fa3f8 100644 --- a/src/tests/ftest/rebuild/mdtest.yaml +++ b/src/tests/ftest/rebuild/mdtest.yaml @@ -50,4 +50,3 @@ mdtest: read_bytes: 512KiB write_bytes: 512KiB num_of_files_dirs: 15625 # 1 million total files - dfs_destroy: false diff --git a/src/tests/ftest/rebuild/widely_striped.yaml b/src/tests/ftest/rebuild/widely_striped.yaml index dfe4b646253..72ceeda3b68 100644 --- a/src/tests/ftest/rebuild/widely_striped.yaml +++ b/src/tests/ftest/rebuild/widely_striped.yaml @@ -35,7 +35,6 @@ mdtest: np: 30 num_of_files_dirs: 4067 # creating total of 120K files test_dir: "/" - dfs_destroy: false dfs_oclass: RP_3G1 dfs_dir_oclass: RP_3G1 manager: "MPICH" diff --git a/src/tests/ftest/util/mdtest_utils.py b/src/tests/ftest/util/mdtest_utils.py index 0b5654ece43..9aca97feae1 100644 --- a/src/tests/ftest/util/mdtest_utils.py +++ b/src/tests/ftest/util/mdtest_utils.py @@ -187,11 +187,11 @@ def __init__(self, log_dir, namespace="/run/mdtest/*"): self.dfs_pool = FormattedParameter("--dfs.pool {}") self.dfs_cont = FormattedParameter("--dfs.cont {}") self.dfs_group = FormattedParameter("--dfs.group {}") - self.dfs_destroy = FormattedParameter("--dfs.destroy", True) - self.dfs_chunk = FormattedParameter("--dfs.chunk_size {}", 1048576) - self.dfs_oclass = FormattedParameter("--dfs.oclass {}", "S1") + self.dfs_destroy = FormattedParameter("--dfs.destroy", False) + self.dfs_chunk = FormattedParameter("--dfs.chunk_size {}") + self.dfs_oclass = FormattedParameter("--dfs.oclass {}") self.dfs_prefix = FormattedParameter("--dfs.prefix {}") - self.dfs_dir_oclass = FormattedParameter("--dfs.dir_oclass {}", "SX") + self.dfs_dir_oclass = FormattedParameter("--dfs.dir_oclass {}") # Include bullseye coverage file environment self.env["COVFILE"] = os.path.join(os.sep, "tmp", "test.cov")