From d98417258eb50f5926592d95fe36d6ead7b1e815 Mon Sep 17 00:00:00 2001 From: Dalton Bohning Date: Wed, 12 Aug 2026 20:25:15 +0000 Subject: [PATCH] DAOS-19493 test: remove control_method daos Remove control_method: daos from test configs since that is the default. Allow-unstable-test: true Signed-off-by: Dalton Bohning --- src/tests/ftest/aggregation/continuous_write.yaml | 1 - src/tests/ftest/aggregation/dfuse_space_check.yaml | 1 - src/tests/ftest/aggregation/io_small.yaml | 1 - src/tests/ftest/aggregation/multiple_pool_cont.yaml | 1 - src/tests/ftest/aggregation/punching.yaml | 1 - src/tests/ftest/aggregation/shutdown_restart.yaml | 1 - src/tests/ftest/aggregation/space_rb.yaml | 1 - src/tests/ftest/aggregation/throttling.yaml | 1 - src/tests/ftest/container/auto_oc_selection.yaml | 1 - src/tests/ftest/container/fill_destroy_loop.yaml | 1 - src/tests/ftest/container/full_pool_container_create.yaml | 3 --- src/tests/ftest/container/label.yaml | 2 -- src/tests/ftest/container/multiple_delete.yaml | 1 - src/tests/ftest/container/open.yaml | 2 -- src/tests/ftest/container/per_server_fault_domain.yaml | 1 - src/tests/ftest/container/rf_enforcement.yaml | 1 - src/tests/ftest/container/snapshot_aggregation.yaml | 1 - src/tests/ftest/control/daos_object_query.yaml | 1 - src/tests/ftest/control/daos_snapshot.yaml | 2 -- src/tests/ftest/control/dmg_pool_query_test.yaml | 1 - src/tests/ftest/control/dmg_telemetry_basic.yaml | 2 -- src/tests/ftest/control/dmg_telemetry_io_basic.yaml | 1 - src/tests/ftest/control/dmg_telemetry_io_latency.yaml | 1 - src/tests/ftest/control/log_entry.yaml | 1 - src/tests/ftest/daos_perf/small.yaml | 1 - src/tests/ftest/daos_test/dfuse.yaml | 1 - src/tests/ftest/daos_vol/bigio.yaml | 1 - src/tests/ftest/daos_vol/h5_suite.yaml | 1 - src/tests/ftest/datamover/copy_procs.yaml | 1 - src/tests/ftest/datamover/dst_create.yaml | 1 - src/tests/ftest/datamover/large_file.yaml | 1 - src/tests/ftest/datamover/negative.yaml | 1 - src/tests/ftest/datamover/negative_space.yaml | 1 - src/tests/ftest/datamover/obj_large_posix.yaml | 1 - src/tests/ftest/datamover/posix_meta_entry.yaml | 1 - src/tests/ftest/datamover/posix_preserve_props.yaml | 1 - src/tests/ftest/datamover/posix_subsets.yaml | 1 - src/tests/ftest/datamover/posix_symlinks.yaml | 1 - src/tests/ftest/datamover/posix_types.yaml | 1 - src/tests/ftest/datamover/serial_large_posix.yaml | 1 - src/tests/ftest/dbench/dbench.yaml | 1 - src/tests/ftest/deployment/agent_failure.yaml | 1 - src/tests/ftest/deployment/disk_failure.yaml | 1 - src/tests/ftest/deployment/ior_per_rank.yaml | 1 - src/tests/ftest/deployment/network_failure.yaml | 2 -- src/tests/ftest/deployment/server_rank_failure.yaml | 2 -- src/tests/ftest/deployment/target_failure.yaml | 2 -- src/tests/ftest/dfuse/bash.yaml | 1 - src/tests/ftest/dfuse/bash_dcache.yaml | 1 - src/tests/ftest/dfuse/bash_fd.yaml | 1 - src/tests/ftest/dfuse/container_attrs.yaml | 5 ----- src/tests/ftest/dfuse/container_type.yaml | 1 - src/tests/ftest/dfuse/daos_build.yaml | 1 - src/tests/ftest/dfuse/daos_build_vm.yaml | 1 - src/tests/ftest/dfuse/enospace.yaml | 1 - src/tests/ftest/dfuse/find.yaml | 1 - src/tests/ftest/dfuse/il_whitelist.yaml | 1 - src/tests/ftest/dfuse/ioctl_pool_handles.yaml | 1 - src/tests/ftest/dfuse/mu_mount.yaml | 1 - src/tests/ftest/dfuse/mu_perms.yaml | 1 - src/tests/ftest/dfuse/pil4dfs_dcache.yaml | 1 - src/tests/ftest/dfuse/pil4dfs_fio.yaml | 1 - src/tests/ftest/dfuse/pil4dfs_many_mounts.yaml | 1 - src/tests/ftest/dfuse/posix_stat.yaml | 1 - src/tests/ftest/dfuse/read.yaml | 1 - src/tests/ftest/dfuse/root_container.yaml | 1 - src/tests/ftest/dfuse/simul.yaml | 1 - src/tests/ftest/dfuse/sparse_file.yaml | 1 - src/tests/ftest/erasurecode/aggregation.yaml | 1 - src/tests/ftest/erasurecode/multiple_rank_failure.yaml | 1 - src/tests/ftest/erasurecode/multiple_target_failure.yaml | 1 - src/tests/ftest/erasurecode/offline_rebuild.yaml | 1 - src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml | 1 - src/tests/ftest/erasurecode/online_rebuild.yaml | 1 - src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml | 1 - src/tests/ftest/erasurecode/rebuild_disabled.yaml | 1 - src/tests/ftest/erasurecode/rebuild_disabled_single.yaml | 1 - src/tests/ftest/erasurecode/rebuild_fio.yaml | 1 - src/tests/ftest/erasurecode/restart.yaml | 1 - src/tests/ftest/erasurecode/space_usage.yaml | 1 - src/tests/ftest/erasurecode/truncate.yaml | 1 - src/tests/ftest/fault_injection/ec.yaml | 1 - src/tests/ftest/fault_injection/pool.yaml | 1 - src/tests/ftest/harness/advanced.yaml | 1 - src/tests/ftest/harness/coverage.yaml | 1 - src/tests/ftest/io/macsio_test.yaml | 1 - src/tests/ftest/io/parallel_io.yaml | 1 - src/tests/ftest/io/seg_count.yaml | 1 - src/tests/ftest/io/small_file_count.yaml | 1 - src/tests/ftest/ior/crash.yaml | 1 - src/tests/ftest/ior/hard.yaml | 1 - src/tests/ftest/ior/hard_rebuild.yaml | 1 - src/tests/ftest/ior/intercept_messages.yaml | 1 - src/tests/ftest/ior/intercept_messages_pil4dfs.yaml | 1 - src/tests/ftest/mpiio/hdf5.yaml | 1 - src/tests/ftest/mpiio/llnl_mpi4py.yaml | 1 - src/tests/ftest/mpiio/romio.yaml | 1 - src/tests/ftest/nvme/enospace.yaml | 1 - src/tests/ftest/nvme/fault.yaml | 1 - src/tests/ftest/nvme/fragmentation.yaml | 1 - src/tests/ftest/nvme/io_verification.yaml | 1 - src/tests/ftest/nvme/pool_capacity.yaml | 1 - src/tests/ftest/nvme/pool_exclude.yaml | 1 - src/tests/ftest/nvme/pool_extend.yaml | 1 - src/tests/ftest/object/same_key_different_value.yaml | 2 -- src/tests/ftest/osa/offline_drain.yaml | 1 - src/tests/ftest/osa/offline_extend.yaml | 1 - src/tests/ftest/osa/offline_parallel_test.yaml | 1 - src/tests/ftest/osa/offline_reintegration.yaml | 1 - src/tests/ftest/osa/online_drain.yaml | 1 - src/tests/ftest/osa/online_extend.yaml | 1 - src/tests/ftest/osa/online_parallel_test.yaml | 1 - src/tests/ftest/osa/online_reintegration.yaml | 1 - src/tests/ftest/performance/ior_easy.yaml | 1 - src/tests/ftest/performance/ior_hard.yaml | 1 - src/tests/ftest/performance/mdtest_easy.yaml | 1 - src/tests/ftest/performance/mdtest_hard.yaml | 1 - src/tests/ftest/pool/destroy.yaml | 1 - src/tests/ftest/pool/list_verbose.yaml | 1 - src/tests/ftest/pool/pda.yaml | 2 -- src/tests/ftest/pool/target_query.yaml | 1 - src/tests/ftest/pool/verify_space.yaml | 1 - src/tests/ftest/pytorch/checkpoint.yaml | 1 - src/tests/ftest/pytorch/dataset.yaml | 1 - src/tests/ftest/rebuild/container_create_race.yaml | 1 - src/tests/ftest/rebuild/container_rf.yaml | 1 - src/tests/ftest/rebuild/continues_after_stop.yaml | 1 - src/tests/ftest/rebuild/mdtest.yaml | 1 - src/tests/ftest/rebuild/no_cap.yaml | 1 - src/tests/ftest/rebuild/pool_destroy_race.yaml | 1 - src/tests/ftest/rebuild/widely_striped.yaml | 1 - src/tests/ftest/rebuild/with_io.yaml | 1 - src/tests/ftest/rebuild/with_ior.yaml | 1 - src/tests/ftest/recovery/check_policy.yaml | 3 --- src/tests/ftest/recovery/check_start_corner_case.yaml | 1 - src/tests/ftest/recovery/check_start_options.yaml | 3 --- src/tests/ftest/recovery/check_stop.yaml | 1 - src/tests/ftest/recovery/container_cleanup.yaml | 1 - src/tests/ftest/recovery/container_list_consolidation.yaml | 1 - src/tests/ftest/recovery/pool_list_consolidation.yaml | 3 --- src/tests/ftest/recovery/pool_membership.yaml | 1 - src/tests/ftest/scrubber/aggregation.yaml | 1 - src/tests/ftest/scrubber/basic.yaml | 1 - src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml | 1 - src/tests/ftest/scrubber/csum_fault.yaml | 1 - src/tests/ftest/scrubber/frequency.yaml | 1 - src/tests/ftest/scrubber/rebuild.yaml | 1 - src/tests/ftest/scrubber/snapshot.yaml | 1 - src/tests/ftest/scrubber/target_auto_eviction.yaml | 1 - src/tests/ftest/security/cont_acl.yaml | 2 -- src/tests/ftest/security/cont_create_acl.yaml | 2 -- src/tests/ftest/security/cont_delete_acl.yaml | 1 - src/tests/ftest/security/cont_get_acl.yaml | 1 - src/tests/ftest/security/cont_overwrite_acl.yaml | 1 - src/tests/ftest/security/cont_owner.yaml | 2 -- src/tests/ftest/security/cont_update_acl.yaml | 1 - src/tests/ftest/security/pool_acl.yaml | 2 -- src/tests/ftest/security/pool_groups.yaml | 2 -- src/tests/ftest/server/cpu_usage.yaml | 1 - src/tests/ftest/server/daos_server_restart.yaml | 3 --- src/tests/ftest/server/multiengine_persocket.yaml | 1 - src/tests/ftest/soak/faults.yaml | 2 -- src/tests/ftest/soak/harassers.yaml | 2 -- src/tests/ftest/soak/smoke.yaml | 2 -- src/tests/ftest/soak/stress.yaml | 2 -- src/tests/ftest/soak/stress_2h.yaml | 2 -- src/tests/ftest/telemetry/basic_client_telemetry.yaml | 1 - src/tests/ftest/telemetry/telemetry_pool_metrics.yaml | 1 - src/tests/ftest/telemetry/wal_metrics.yaml | 1 - src/tests/ftest/vmd/fault_reintegration.yaml | 1 - src/tests/ftest/vmd/led.yaml | 1 - 171 files changed, 204 deletions(-) diff --git a/src/tests/ftest/aggregation/continuous_write.yaml b/src/tests/ftest/aggregation/continuous_write.yaml index 56ff036a86f..ecda6a4857b 100644 --- a/src/tests/ftest/aggregation/continuous_write.yaml +++ b/src/tests/ftest/aggregation/continuous_write.yaml @@ -20,7 +20,6 @@ pool: container: type: POSIX - control_method: daos ior: flags: -w diff --git a/src/tests/ftest/aggregation/dfuse_space_check.yaml b/src/tests/ftest/aggregation/dfuse_space_check.yaml index f4f29e8f6c4..e3b95570f03 100644 --- a/src/tests/ftest/aggregation/dfuse_space_check.yaml +++ b/src/tests/ftest/aggregation/dfuse_space_check.yaml @@ -18,7 +18,6 @@ pool: container: type: POSIX - control_method: daos dfuse_space_check: block_size: 2097152 # 2M diff --git a/src/tests/ftest/aggregation/io_small.yaml b/src/tests/ftest/aggregation/io_small.yaml index 7589a910690..16ff1aefbb2 100644 --- a/src/tests/ftest/aggregation/io_small.yaml +++ b/src/tests/ftest/aggregation/io_small.yaml @@ -15,7 +15,6 @@ pool: svcn: 1 container: type: POSIX - control_method: daos ior: client_processes: np: 12 diff --git a/src/tests/ftest/aggregation/multiple_pool_cont.yaml b/src/tests/ftest/aggregation/multiple_pool_cont.yaml index e816da4011e..acd1033004e 100644 --- a/src/tests/ftest/aggregation/multiple_pool_cont.yaml +++ b/src/tests/ftest/aggregation/multiple_pool_cont.yaml @@ -36,7 +36,6 @@ pool: container: type: POSIX - control_method: daos ior: client_processes: diff --git a/src/tests/ftest/aggregation/punching.yaml b/src/tests/ftest/aggregation/punching.yaml index a7ab56d903f..e9f0ec87dce 100644 --- a/src/tests/ftest/aggregation/punching.yaml +++ b/src/tests/ftest/aggregation/punching.yaml @@ -22,7 +22,6 @@ pool: !mux mem_ratio: 25 container: type: POSIX - control_method: daos mdtest: client_processes: np: 2 diff --git a/src/tests/ftest/aggregation/shutdown_restart.yaml b/src/tests/ftest/aggregation/shutdown_restart.yaml index 9b765991ed5..6140936751d 100644 --- a/src/tests/ftest/aggregation/shutdown_restart.yaml +++ b/src/tests/ftest/aggregation/shutdown_restart.yaml @@ -14,7 +14,6 @@ pool: svcn: 1 container: type: POSIX - control_method: daos ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/aggregation/space_rb.yaml b/src/tests/ftest/aggregation/space_rb.yaml index c5d71faaf03..996ad6f7878 100644 --- a/src/tests/ftest/aggregation/space_rb.yaml +++ b/src/tests/ftest/aggregation/space_rb.yaml @@ -20,7 +20,6 @@ pool: container: type: POSIX - control_method: daos ior: &ior_base flags: -w diff --git a/src/tests/ftest/aggregation/throttling.yaml b/src/tests/ftest/aggregation/throttling.yaml index 23520a9d6d9..a4caf3ee67f 100644 --- a/src/tests/ftest/aggregation/throttling.yaml +++ b/src/tests/ftest/aggregation/throttling.yaml @@ -15,7 +15,6 @@ pool: svcn: 1 container: type: POSIX - control_method: daos ior: client_processes: np: 12 diff --git a/src/tests/ftest/container/auto_oc_selection.yaml b/src/tests/ftest/container/auto_oc_selection.yaml index db2ed69fcf9..e840a169057 100644 --- a/src/tests/ftest/container/auto_oc_selection.yaml +++ b/src/tests/ftest/container/auto_oc_selection.yaml @@ -17,5 +17,4 @@ server_config: pool: scm_size: 1G container: - control_method: daos type: POSIX diff --git a/src/tests/ftest/container/fill_destroy_loop.yaml b/src/tests/ftest/container/fill_destroy_loop.yaml index f6f124ba141..33ed5961423 100644 --- a/src/tests/ftest/container/fill_destroy_loop.yaml +++ b/src/tests/ftest/container/fill_destroy_loop.yaml @@ -24,7 +24,6 @@ pool: - "time" container: - control_method: daos oclass: SX type: POSIX object_qty: 1 diff --git a/src/tests/ftest/container/full_pool_container_create.yaml b/src/tests/ftest/container/full_pool_container_create.yaml index 839f741aab4..e05ae6ad21a 100644 --- a/src/tests/ftest/container/full_pool_container_create.yaml +++ b/src/tests/ftest/container/full_pool_container_create.yaml @@ -14,6 +14,3 @@ timeout: 900 pool: size: 20G threshold_percent: 0.1 # 10% - -container: - control_method: daos diff --git a/src/tests/ftest/container/label.yaml b/src/tests/ftest/container/label.yaml index d7a105d366f..6f86b0b033d 100644 --- a/src/tests/ftest/container/label.yaml +++ b/src/tests/ftest/container/label.yaml @@ -20,5 +20,3 @@ server_config: system_ram_reserved: 1 pool: size: 1G -container: - control_method: daos diff --git a/src/tests/ftest/container/multiple_delete.yaml b/src/tests/ftest/container/multiple_delete.yaml index 037e08f1d76..e5940a28dee 100644 --- a/src/tests/ftest/container/multiple_delete.yaml +++ b/src/tests/ftest/container/multiple_delete.yaml @@ -26,7 +26,6 @@ pool: container: type: POSIX - control_method: daos ior: client_processes: diff --git a/src/tests/ftest/container/open.yaml b/src/tests/ftest/container/open.yaml index 6604fd3bde1..394e433127b 100644 --- a/src/tests/ftest/container/open.yaml +++ b/src/tests/ftest/container/open.yaml @@ -16,8 +16,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1G -container: - control_method: daos uuid_poh: !mux good_uuid_good_poh: uuid: PASS diff --git a/src/tests/ftest/container/per_server_fault_domain.yaml b/src/tests/ftest/container/per_server_fault_domain.yaml index 0554ced3603..49a310e2114 100644 --- a/src/tests/ftest/container/per_server_fault_domain.yaml +++ b/src/tests/ftest/container/per_server_fault_domain.yaml @@ -25,7 +25,6 @@ pool: properties: space_rb:5 container: - control_method: daos type: POSIX ior: diff --git a/src/tests/ftest/container/rf_enforcement.yaml b/src/tests/ftest/container/rf_enforcement.yaml index 201435aa576..6ea3ed4d21a 100644 --- a/src/tests/ftest/container/rf_enforcement.yaml +++ b/src/tests/ftest/container/rf_enforcement.yaml @@ -19,7 +19,6 @@ pool: svcn: 3 pool_query_timeout: 30 container: - control_method: daos akey_size: 5 dkey_size: 5 data_size: 5 diff --git a/src/tests/ftest/container/snapshot_aggregation.yaml b/src/tests/ftest/container/snapshot_aggregation.yaml index b55d173060f..95421c4da40 100644 --- a/src/tests/ftest/container/snapshot_aggregation.yaml +++ b/src/tests/ftest/container/snapshot_aggregation.yaml @@ -27,7 +27,6 @@ pool: target_list: [0, 1] container: - control_method: daos type: POSIX ior: diff --git a/src/tests/ftest/control/daos_object_query.yaml b/src/tests/ftest/control/daos_object_query.yaml index cd20803979b..6290f5b3bde 100644 --- a/src/tests/ftest/control/daos_object_query.yaml +++ b/src/tests/ftest/control/daos_object_query.yaml @@ -17,7 +17,6 @@ server_config: pool: scm_size: 3G container: - control_method: daos type: POSIX class_names: !mux oclass_s1: diff --git a/src/tests/ftest/control/daos_snapshot.yaml b/src/tests/ftest/control/daos_snapshot.yaml index bf67c6552bc..0ae24063302 100644 --- a/src/tests/ftest/control/daos_snapshot.yaml +++ b/src/tests/ftest/control/daos_snapshot.yaml @@ -16,8 +16,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1G -container: - control_method: daos stress_test: !mux small: snapshot_count: 5 diff --git a/src/tests/ftest/control/dmg_pool_query_test.yaml b/src/tests/ftest/control/dmg_pool_query_test.yaml index 17d5df77bad..f7fb499b84e 100644 --- a/src/tests/ftest/control/dmg_pool_query_test.yaml +++ b/src/tests/ftest/control/dmg_pool_query_test.yaml @@ -16,7 +16,6 @@ pool: nvme_size: 32GB container: type: POSIX - control_method: daos ior: flags: "-k -w -r" transfer_size: "64M" diff --git a/src/tests/ftest/control/dmg_telemetry_basic.yaml b/src/tests/ftest/control/dmg_telemetry_basic.yaml index 69af131fc6f..23d9aeda1c7 100644 --- a/src/tests/ftest/control/dmg_telemetry_basic.yaml +++ b/src/tests/ftest/control/dmg_telemetry_basic.yaml @@ -18,8 +18,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 2G -container: - control_method: daos test: container_qty: 5 open_close_qty: 3 diff --git a/src/tests/ftest/control/dmg_telemetry_io_basic.yaml b/src/tests/ftest/control/dmg_telemetry_io_basic.yaml index a11d9fef932..eff542fb856 100644 --- a/src/tests/ftest/control/dmg_telemetry_io_basic.yaml +++ b/src/tests/ftest/control/dmg_telemetry_io_basic.yaml @@ -24,7 +24,6 @@ pool: container: type: POSIX - control_method: daos block_sizes: [10M, 500M] transfer_sizes: [256K, 1M] diff --git a/src/tests/ftest/control/dmg_telemetry_io_latency.yaml b/src/tests/ftest/control/dmg_telemetry_io_latency.yaml index b6e601e8eaf..a3ac910c5ff 100644 --- a/src/tests/ftest/control/dmg_telemetry_io_latency.yaml +++ b/src/tests/ftest/control/dmg_telemetry_io_latency.yaml @@ -17,7 +17,6 @@ pool: container: type: POSIX - control_method: daos ior: block_size: 8M diff --git a/src/tests/ftest/control/log_entry.yaml b/src/tests/ftest/control/log_entry.yaml index 8feead0292f..350a493aa02 100644 --- a/src/tests/ftest/control/log_entry.yaml +++ b/src/tests/ftest/control/log_entry.yaml @@ -22,5 +22,4 @@ pool: svcn: 5 container: - control_method: daos type: POSIX diff --git a/src/tests/ftest/daos_perf/small.yaml b/src/tests/ftest/daos_perf/small.yaml index 6298aea44f9..0f2184b0e91 100644 --- a/src/tests/ftest/daos_perf/small.yaml +++ b/src/tests/ftest/daos_perf/small.yaml @@ -14,7 +14,6 @@ pool: container: type: POSIX - control_method: daos server_config: name: daos_server diff --git a/src/tests/ftest/daos_test/dfuse.yaml b/src/tests/ftest/daos_test/dfuse.yaml index e7633dcfbbf..9d6b73b1b7a 100644 --- a/src/tests/ftest/daos_test/dfuse.yaml +++ b/src/tests/ftest/daos_test/dfuse.yaml @@ -18,7 +18,6 @@ server_config: system_ram_reserved: 1 container: type: POSIX - control_method: daos dfuse: !mux writeback: # File metadata is incorrect after write with writeback caching and IL. diff --git a/src/tests/ftest/daos_vol/bigio.yaml b/src/tests/ftest/daos_vol/bigio.yaml index 668e834b39d..2b273c1cab5 100644 --- a/src/tests/ftest/daos_vol/bigio.yaml +++ b/src/tests/ftest/daos_vol/bigio.yaml @@ -33,7 +33,6 @@ pool: container: type: POSIX - control_method: daos daos_vol_tests: testname: h5_partest_t_bigio diff --git a/src/tests/ftest/daos_vol/h5_suite.yaml b/src/tests/ftest/daos_vol/h5_suite.yaml index d1568cf90c1..5eb48da2b75 100644 --- a/src/tests/ftest/daos_vol/h5_suite.yaml +++ b/src/tests/ftest/daos_vol/h5_suite.yaml @@ -16,7 +16,6 @@ pool: nvme_size: 100G container: type: POSIX - control_method: daos daos_vol_tests: !mux test1: testname: h5_partest_t_shapesame diff --git a/src/tests/ftest/datamover/copy_procs.yaml b/src/tests/ftest/datamover/copy_procs.yaml index 9984581a9e5..b178bd634c4 100644 --- a/src/tests/ftest/datamover/copy_procs.yaml +++ b/src/tests/ftest/datamover/copy_procs.yaml @@ -16,7 +16,6 @@ pool: container: type: POSIX - control_method: daos ior: api: 'DFS' diff --git a/src/tests/ftest/datamover/dst_create.yaml b/src/tests/ftest/datamover/dst_create.yaml index 33846b24c9c..93604a443cc 100644 --- a/src/tests/ftest/datamover/dst_create.yaml +++ b/src/tests/ftest/datamover/dst_create.yaml @@ -17,7 +17,6 @@ server_config: pool: size: 1G container: - control_method: daos properties: compression:lz4 ior: client_processes: diff --git a/src/tests/ftest/datamover/large_file.yaml b/src/tests/ftest/datamover/large_file.yaml index 9a273ef9783..e7f5fd1fdda 100644 --- a/src/tests/ftest/datamover/large_file.yaml +++ b/src/tests/ftest/datamover/large_file.yaml @@ -27,7 +27,6 @@ pool: container: type: POSIX - control_method: daos ior: client_ppn: diff --git a/src/tests/ftest/datamover/negative.yaml b/src/tests/ftest/datamover/negative.yaml index 8ff2dc4d463..59d15c3783c 100644 --- a/src/tests/ftest/datamover/negative.yaml +++ b/src/tests/ftest/datamover/negative.yaml @@ -18,7 +18,6 @@ pool: scm_size: 5.1G container: type: POSIX - control_method: daos ior: client_processes: np: 1 diff --git a/src/tests/ftest/datamover/negative_space.yaml b/src/tests/ftest/datamover/negative_space.yaml index 601d5aca4ff..0cb8cae2211 100644 --- a/src/tests/ftest/datamover/negative_space.yaml +++ b/src/tests/ftest/datamover/negative_space.yaml @@ -20,7 +20,6 @@ pool_small: size: 64M container: type: POSIX - control_method: daos ior: client_processes: np: 1 diff --git a/src/tests/ftest/datamover/obj_large_posix.yaml b/src/tests/ftest/datamover/obj_large_posix.yaml index 1fcc0ae20bd..d586e2a06bf 100644 --- a/src/tests/ftest/datamover/obj_large_posix.yaml +++ b/src/tests/ftest/datamover/obj_large_posix.yaml @@ -26,7 +26,6 @@ pool: container: type: POSIX - control_method: daos mdtest: client_processes: diff --git a/src/tests/ftest/datamover/posix_meta_entry.yaml b/src/tests/ftest/datamover/posix_meta_entry.yaml index 35e103e7266..f6139de55d9 100644 --- a/src/tests/ftest/datamover/posix_meta_entry.yaml +++ b/src/tests/ftest/datamover/posix_meta_entry.yaml @@ -18,7 +18,6 @@ pool: scm_size: 1G container: type: POSIX - control_method: daos dcp: env_vars: - D_LOG_MASK=INFO,DFS=DEBUG diff --git a/src/tests/ftest/datamover/posix_preserve_props.yaml b/src/tests/ftest/datamover/posix_preserve_props.yaml index 96412345bd2..f2548b36f83 100644 --- a/src/tests/ftest/datamover/posix_preserve_props.yaml +++ b/src/tests/ftest/datamover/posix_preserve_props.yaml @@ -18,7 +18,6 @@ pool: scm_size: 1G container: type: POSIX - control_method: daos properties: compression:lz4 ior: client_processes: diff --git a/src/tests/ftest/datamover/posix_subsets.yaml b/src/tests/ftest/datamover/posix_subsets.yaml index fb0e1d44dd1..395b6b48ace 100644 --- a/src/tests/ftest/datamover/posix_subsets.yaml +++ b/src/tests/ftest/datamover/posix_subsets.yaml @@ -18,7 +18,6 @@ pool: scm_size: 1G container: type: POSIX - control_method: daos ior: client_processes: np: 1 diff --git a/src/tests/ftest/datamover/posix_symlinks.yaml b/src/tests/ftest/datamover/posix_symlinks.yaml index def8198ce0e..c5f7190f045 100644 --- a/src/tests/ftest/datamover/posix_symlinks.yaml +++ b/src/tests/ftest/datamover/posix_symlinks.yaml @@ -18,7 +18,6 @@ pool: scm_size: 1G container: type: POSIX - control_method: daos dcp: client_processes: np: 1 diff --git a/src/tests/ftest/datamover/posix_types.yaml b/src/tests/ftest/datamover/posix_types.yaml index bdcf0007097..31532422aee 100644 --- a/src/tests/ftest/datamover/posix_types.yaml +++ b/src/tests/ftest/datamover/posix_types.yaml @@ -18,7 +18,6 @@ pool: scm_size: 1G container: type: POSIX - control_method: daos ior: client_processes: np: 1 diff --git a/src/tests/ftest/datamover/serial_large_posix.yaml b/src/tests/ftest/datamover/serial_large_posix.yaml index f813a6df3af..4d4441a22cd 100644 --- a/src/tests/ftest/datamover/serial_large_posix.yaml +++ b/src/tests/ftest/datamover/serial_large_posix.yaml @@ -26,7 +26,6 @@ pool: container: type: POSIX - control_method: daos mdtest: client_processes: diff --git a/src/tests/ftest/dbench/dbench.yaml b/src/tests/ftest/dbench/dbench.yaml index 6a6700ac9c2..774acef5ad0 100644 --- a/src/tests/ftest/dbench/dbench.yaml +++ b/src/tests/ftest/dbench/dbench.yaml @@ -17,7 +17,6 @@ pool: container: type: POSIX - control_method: daos dbench: loadfile: /usr/share/dbench/client.txt # writes about 25M and perform 500 thousand operations diff --git a/src/tests/ftest/deployment/agent_failure.yaml b/src/tests/ftest/deployment/agent_failure.yaml index 474b0d16a7b..fa5db15f5bc 100644 --- a/src/tests/ftest/deployment/agent_failure.yaml +++ b/src/tests/ftest/deployment/agent_failure.yaml @@ -30,7 +30,6 @@ pool: container: type: POSIX - control_method: daos ior: &ior_base client_processes: diff --git a/src/tests/ftest/deployment/disk_failure.yaml b/src/tests/ftest/deployment/disk_failure.yaml index 9380b1d8efa..8f9b90ea7db 100644 --- a/src/tests/ftest/deployment/disk_failure.yaml +++ b/src/tests/ftest/deployment/disk_failure.yaml @@ -30,7 +30,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2GX properties: "cksum:crc16,rf:1" diff --git a/src/tests/ftest/deployment/ior_per_rank.yaml b/src/tests/ftest/deployment/ior_per_rank.yaml index 7c890651b0a..22b47abaf81 100644 --- a/src/tests/ftest/deployment/ior_per_rank.yaml +++ b/src/tests/ftest/deployment/ior_per_rank.yaml @@ -27,7 +27,6 @@ pool: container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on - control_method: daos oclass: SX ior: diff --git a/src/tests/ftest/deployment/network_failure.yaml b/src/tests/ftest/deployment/network_failure.yaml index 12101be4d98..e6a7c73b079 100644 --- a/src/tests/ftest/deployment/network_failure.yaml +++ b/src/tests/ftest/deployment/network_failure.yaml @@ -31,10 +31,8 @@ pool_size_value: container_wo_rf: type: POSIX - control_method: daos container_with_rf: type: POSIX - control_method: daos properties: rd_fac:1 ior: &ior_base diff --git a/src/tests/ftest/deployment/server_rank_failure.yaml b/src/tests/ftest/deployment/server_rank_failure.yaml index 57d6c894742..42d86c5c729 100644 --- a/src/tests/ftest/deployment/server_rank_failure.yaml +++ b/src/tests/ftest/deployment/server_rank_failure.yaml @@ -39,11 +39,9 @@ pool_size_value: container: type: POSIX - control_method: daos properties: rd_fac:2 container_wo_rf: type: POSIX - control_method: daos ior: &ior_base client_processes: diff --git a/src/tests/ftest/deployment/target_failure.yaml b/src/tests/ftest/deployment/target_failure.yaml index 19adfc7d277..e954adc8d96 100644 --- a/src/tests/ftest/deployment/target_failure.yaml +++ b/src/tests/ftest/deployment/target_failure.yaml @@ -28,10 +28,8 @@ pool_size_ratio_66: container_wo_rf: type: POSIX - control_method: daos container_with_rf: type: POSIX - control_method: daos properties: rd_fac:1 ior: &ior_base diff --git a/src/tests/ftest/dfuse/bash.yaml b/src/tests/ftest/dfuse/bash.yaml index d342d884599..dc85d95afb6 100644 --- a/src/tests/ftest/dfuse/bash.yaml +++ b/src/tests/ftest/dfuse/bash.yaml @@ -18,4 +18,3 @@ pool: scm_size: 1000000000 container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/dfuse/bash_dcache.yaml b/src/tests/ftest/dfuse/bash_dcache.yaml index 3ecc79a828f..b12eff7fb6c 100644 --- a/src/tests/ftest/dfuse/bash_dcache.yaml +++ b/src/tests/ftest/dfuse/bash_dcache.yaml @@ -18,4 +18,3 @@ pool: scm_size: 1G container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/dfuse/bash_fd.yaml b/src/tests/ftest/dfuse/bash_fd.yaml index 3ecc79a828f..b12eff7fb6c 100644 --- a/src/tests/ftest/dfuse/bash_fd.yaml +++ b/src/tests/ftest/dfuse/bash_fd.yaml @@ -18,4 +18,3 @@ pool: scm_size: 1G container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/dfuse/container_attrs.yaml b/src/tests/ftest/dfuse/container_attrs.yaml index d27a44fbf71..084ef4220bf 100644 --- a/src/tests/ftest/dfuse/container_attrs.yaml +++ b/src/tests/ftest/dfuse/container_attrs.yaml @@ -27,21 +27,16 @@ pool: container_01: type: POSIX attrs: dfuse-attr-time:666,dfuse-dentry-time:999 - control_method: daos container_02: type: POSIX - control_method: daos container_03: type: POSIX attrs: dfuse-attr-time:42,dfuse-dentry-time:404 - control_method: daos container_04: type: POSIX - control_method: daos container_05: type: POSIX - control_method: daos diff --git a/src/tests/ftest/dfuse/container_type.yaml b/src/tests/ftest/dfuse/container_type.yaml index 7e4d2d77020..f99283b11b7 100644 --- a/src/tests/ftest/dfuse/container_type.yaml +++ b/src/tests/ftest/dfuse/container_type.yaml @@ -20,4 +20,3 @@ container: cont_types: - "" - "POSIX" - control_method: daos diff --git a/src/tests/ftest/dfuse/daos_build.yaml b/src/tests/ftest/dfuse/daos_build.yaml index d7c819d3a0a..1f559889732 100644 --- a/src/tests/ftest/dfuse/daos_build.yaml +++ b/src/tests/ftest/dfuse/daos_build.yaml @@ -22,7 +22,6 @@ pool: container: type: POSIX - control_method: daos dfuse: cores: '0-17' diff --git a/src/tests/ftest/dfuse/daos_build_vm.yaml b/src/tests/ftest/dfuse/daos_build_vm.yaml index 92b1d95bad0..85453148b46 100644 --- a/src/tests/ftest/dfuse/daos_build_vm.yaml +++ b/src/tests/ftest/dfuse/daos_build_vm.yaml @@ -26,7 +26,6 @@ pool: container: type: POSIX - control_method: daos dfuse: cores: '0-17' diff --git a/src/tests/ftest/dfuse/enospace.yaml b/src/tests/ftest/dfuse/enospace.yaml index 94c7e704ca7..15c783e6c70 100644 --- a/src/tests/ftest/dfuse/enospace.yaml +++ b/src/tests/ftest/dfuse/enospace.yaml @@ -18,6 +18,5 @@ pool: size: 128MiB container: type: POSIX - control_method: daos dfuse: disable_caching: true diff --git a/src/tests/ftest/dfuse/find.yaml b/src/tests/ftest/dfuse/find.yaml index 97e36b68130..aae7bec826c 100644 --- a/src/tests/ftest/dfuse/find.yaml +++ b/src/tests/ftest/dfuse/find.yaml @@ -17,7 +17,6 @@ pool: container: type: POSIX - control_method: daos cont_count: 5 find_cmd: diff --git a/src/tests/ftest/dfuse/il_whitelist.yaml b/src/tests/ftest/dfuse/il_whitelist.yaml index 3c483ba3af2..3097e678991 100644 --- a/src/tests/ftest/dfuse/il_whitelist.yaml +++ b/src/tests/ftest/dfuse/il_whitelist.yaml @@ -18,4 +18,3 @@ pool: scm_size: 1000000000 container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/dfuse/ioctl_pool_handles.yaml b/src/tests/ftest/dfuse/ioctl_pool_handles.yaml index 35752453850..b2770bea93a 100644 --- a/src/tests/ftest/dfuse/ioctl_pool_handles.yaml +++ b/src/tests/ftest/dfuse/ioctl_pool_handles.yaml @@ -23,7 +23,6 @@ pool: size: 10GB container: - control_method: daos type: POSIX ior_write: diff --git a/src/tests/ftest/dfuse/mu_mount.yaml b/src/tests/ftest/dfuse/mu_mount.yaml index 7ceaf3b10ed..6af9cd54592 100644 --- a/src/tests/ftest/dfuse/mu_mount.yaml +++ b/src/tests/ftest/dfuse/mu_mount.yaml @@ -18,4 +18,3 @@ pool: size: 1GiB container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/dfuse/mu_perms.yaml b/src/tests/ftest/dfuse/mu_perms.yaml index eeaacf23796..e7bf0623d47 100644 --- a/src/tests/ftest/dfuse/mu_perms.yaml +++ b/src/tests/ftest/dfuse/mu_perms.yaml @@ -17,7 +17,6 @@ server_config: pool: size: 1G container: - control_method: daos type: POSIX dfuse: disable_caching: true diff --git a/src/tests/ftest/dfuse/pil4dfs_dcache.yaml b/src/tests/ftest/dfuse/pil4dfs_dcache.yaml index 34b301878c6..9ddd4deef4e 100644 --- a/src/tests/ftest/dfuse/pil4dfs_dcache.yaml +++ b/src/tests/ftest/dfuse/pil4dfs_dcache.yaml @@ -22,4 +22,3 @@ pool: container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/dfuse/pil4dfs_fio.yaml b/src/tests/ftest/dfuse/pil4dfs_fio.yaml index 24101b84412..b915b67c292 100644 --- a/src/tests/ftest/dfuse/pil4dfs_fio.yaml +++ b/src/tests/ftest/dfuse/pil4dfs_fio.yaml @@ -24,7 +24,6 @@ pool: container: type: POSIX - control_method: daos test_pil4dfs_vs_dfs: bw_deltas: diff --git a/src/tests/ftest/dfuse/pil4dfs_many_mounts.yaml b/src/tests/ftest/dfuse/pil4dfs_many_mounts.yaml index 8b649ca4c79..18e47f2b20b 100644 --- a/src/tests/ftest/dfuse/pil4dfs_many_mounts.yaml +++ b/src/tests/ftest/dfuse/pil4dfs_many_mounts.yaml @@ -18,7 +18,6 @@ pool: size: 1GiB container: type: POSIX - control_method: daos test: # Mount counts at/below MAX_DAOS_MT for which libpil4dfs enables interception. intercept_mount_counts: diff --git a/src/tests/ftest/dfuse/posix_stat.yaml b/src/tests/ftest/dfuse/posix_stat.yaml index 8a5be135791..3f0f4880200 100644 --- a/src/tests/ftest/dfuse/posix_stat.yaml +++ b/src/tests/ftest/dfuse/posix_stat.yaml @@ -18,7 +18,6 @@ pool: container: type: POSIX - control_method: daos block_sizes: [1M, 10M, 100M, 500M] diff --git a/src/tests/ftest/dfuse/read.yaml b/src/tests/ftest/dfuse/read.yaml index 0d2e80a954d..b95c29fdeae 100644 --- a/src/tests/ftest/dfuse/read.yaml +++ b/src/tests/ftest/dfuse/read.yaml @@ -18,6 +18,5 @@ pool: size: 1G container: type: POSIX - control_method: daos dfuse: disable_wb_cache: false diff --git a/src/tests/ftest/dfuse/root_container.yaml b/src/tests/ftest/dfuse/root_container.yaml index a0909005630..e411209bd94 100644 --- a/src/tests/ftest/dfuse/root_container.yaml +++ b/src/tests/ftest/dfuse/root_container.yaml @@ -18,7 +18,6 @@ pool: container: type: POSIX - control_method: daos cont_count: 10 tmp_file_name: test_file tmp_file_count: 2 diff --git a/src/tests/ftest/dfuse/simul.yaml b/src/tests/ftest/dfuse/simul.yaml index ffeedc7eb77..607216f9fc9 100644 --- a/src/tests/ftest/dfuse/simul.yaml +++ b/src/tests/ftest/dfuse/simul.yaml @@ -16,7 +16,6 @@ pool: container: type: POSIX - control_method: daos mpi: mpi_type: mpich diff --git a/src/tests/ftest/dfuse/sparse_file.yaml b/src/tests/ftest/dfuse/sparse_file.yaml index 5b30160a012..cf3253436fe 100644 --- a/src/tests/ftest/dfuse/sparse_file.yaml +++ b/src/tests/ftest/dfuse/sparse_file.yaml @@ -14,4 +14,3 @@ pool: nvme_size: 1073741824 container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/erasurecode/aggregation.yaml b/src/tests/ftest/erasurecode/aggregation.yaml index a7addf82078..ae536c10362 100644 --- a/src/tests/ftest/erasurecode/aggregation.yaml +++ b/src/tests/ftest/erasurecode/aggregation.yaml @@ -31,7 +31,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/erasurecode/multiple_rank_failure.yaml b/src/tests/ftest/erasurecode/multiple_rank_failure.yaml index 88806efa2f3..c577e164ea1 100644 --- a/src/tests/ftest/erasurecode/multiple_rank_failure.yaml +++ b/src/tests/ftest/erasurecode/multiple_rank_failure.yaml @@ -29,7 +29,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on ior: diff --git a/src/tests/ftest/erasurecode/multiple_target_failure.yaml b/src/tests/ftest/erasurecode/multiple_target_failure.yaml index 88806efa2f3..c577e164ea1 100644 --- a/src/tests/ftest/erasurecode/multiple_target_failure.yaml +++ b/src/tests/ftest/erasurecode/multiple_target_failure.yaml @@ -29,7 +29,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on ior: diff --git a/src/tests/ftest/erasurecode/offline_rebuild.yaml b/src/tests/ftest/erasurecode/offline_rebuild.yaml index b84689f101b..583f9584c00 100644 --- a/src/tests/ftest/erasurecode/offline_rebuild.yaml +++ b/src/tests/ftest/erasurecode/offline_rebuild.yaml @@ -36,7 +36,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml b/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml index 8f66eaf8f73..5acadeca216 100644 --- a/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml +++ b/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml @@ -29,7 +29,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/erasurecode/online_rebuild.yaml b/src/tests/ftest/erasurecode/online_rebuild.yaml index 20708ea4d2c..35c72084564 100644 --- a/src/tests/ftest/erasurecode/online_rebuild.yaml +++ b/src/tests/ftest/erasurecode/online_rebuild.yaml @@ -38,7 +38,6 @@ pool: container: type: POSIX - control_method: daos daos: container: diff --git a/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml b/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml index b8f5fa4afc4..639bef12d75 100644 --- a/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml +++ b/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml @@ -45,7 +45,6 @@ pool: container: type: POSIX - control_method: daos properties: rd_fac:2 mdtest: diff --git a/src/tests/ftest/erasurecode/rebuild_disabled.yaml b/src/tests/ftest/erasurecode/rebuild_disabled.yaml index 3cf796c63bf..f6fd06bc835 100644 --- a/src/tests/ftest/erasurecode/rebuild_disabled.yaml +++ b/src/tests/ftest/erasurecode/rebuild_disabled.yaml @@ -36,7 +36,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml b/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml index a91040c59e8..52888efdd38 100644 --- a/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml +++ b/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml @@ -37,7 +37,6 @@ pool: container: type: POSIX - control_method: daos single_data_set: # [object_qty, record_qty, dkey, akey, data_size] - [1, 1, 1, 1, 4194304] diff --git a/src/tests/ftest/erasurecode/rebuild_fio.yaml b/src/tests/ftest/erasurecode/rebuild_fio.yaml index 8e013758a11..c986ca4f27b 100644 --- a/src/tests/ftest/erasurecode/rebuild_fio.yaml +++ b/src/tests/ftest/erasurecode/rebuild_fio.yaml @@ -40,7 +40,6 @@ pool: container: type: POSIX - control_method: daos rf_properties: !mux rf1: properties: rd_fac:1 diff --git a/src/tests/ftest/erasurecode/restart.yaml b/src/tests/ftest/erasurecode/restart.yaml index d8cc0c1a844..1cb7531677a 100644 --- a/src/tests/ftest/erasurecode/restart.yaml +++ b/src/tests/ftest/erasurecode/restart.yaml @@ -32,7 +32,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/erasurecode/space_usage.yaml b/src/tests/ftest/erasurecode/space_usage.yaml index f20803d261e..fdf788903db 100644 --- a/src/tests/ftest/erasurecode/space_usage.yaml +++ b/src/tests/ftest/erasurecode/space_usage.yaml @@ -27,7 +27,6 @@ pool: container: type: POSIX - control_method: daos ior: &ior_base client_processes: diff --git a/src/tests/ftest/erasurecode/truncate.yaml b/src/tests/ftest/erasurecode/truncate.yaml index 9d277e41004..94dd72c6bca 100644 --- a/src/tests/ftest/erasurecode/truncate.yaml +++ b/src/tests/ftest/erasurecode/truncate.yaml @@ -36,7 +36,6 @@ pool: container: type: POSIX - control_method: daos rf_properties: !mux rf1: properties: rd_fac:1 diff --git a/src/tests/ftest/fault_injection/ec.yaml b/src/tests/ftest/fault_injection/ec.yaml index a112dcf3dc7..5fac28c241b 100644 --- a/src/tests/ftest/fault_injection/ec.yaml +++ b/src/tests/ftest/fault_injection/ec.yaml @@ -29,7 +29,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 ior: diff --git a/src/tests/ftest/fault_injection/pool.yaml b/src/tests/ftest/fault_injection/pool.yaml index dc31c0bc6f5..5585408b2c6 100644 --- a/src/tests/ftest/fault_injection/pool.yaml +++ b/src/tests/ftest/fault_injection/pool.yaml @@ -34,7 +34,6 @@ container: akey_size: 10 dkey_size: 10 data_array: 10 - control_method: daos object_class: OC_RP_3G1 diff --git a/src/tests/ftest/harness/advanced.yaml b/src/tests/ftest/harness/advanced.yaml index 3946594dfa2..f669b566efe 100644 --- a/src/tests/ftest/harness/advanced.yaml +++ b/src/tests/ftest/harness/advanced.yaml @@ -15,4 +15,3 @@ pool: size: 2G container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/harness/coverage.yaml b/src/tests/ftest/harness/coverage.yaml index 592dde0e5ce..d6df26b90e4 100644 --- a/src/tests/ftest/harness/coverage.yaml +++ b/src/tests/ftest/harness/coverage.yaml @@ -21,7 +21,6 @@ pool: size: 2G container: - control_method: daos type: POSIX ior: &ior_base diff --git a/src/tests/ftest/io/macsio_test.yaml b/src/tests/ftest/io/macsio_test.yaml index ea3f5605577..c78dab9dfbf 100644 --- a/src/tests/ftest/io/macsio_test.yaml +++ b/src/tests/ftest/io/macsio_test.yaml @@ -24,7 +24,6 @@ pool: nvme_size: 10G container: - control_method: daos type: POSIX macsio: diff --git a/src/tests/ftest/io/parallel_io.yaml b/src/tests/ftest/io/parallel_io.yaml index 5572365a6df..1e308c2b241 100644 --- a/src/tests/ftest/io/parallel_io.yaml +++ b/src/tests/ftest/io/parallel_io.yaml @@ -17,7 +17,6 @@ pool: container: type: POSIX - control_method: daos cont_count: 10 fio: diff --git a/src/tests/ftest/io/seg_count.yaml b/src/tests/ftest/io/seg_count.yaml index 7a2d5bd5c8e..7749687298f 100644 --- a/src/tests/ftest/io/seg_count.yaml +++ b/src/tests/ftest/io/seg_count.yaml @@ -24,7 +24,6 @@ pool: container: type: POSIX - control_method: daos ior: client_processes: !mux diff --git a/src/tests/ftest/io/small_file_count.yaml b/src/tests/ftest/io/small_file_count.yaml index b5cd440dd5e..8ca76bac33d 100644 --- a/src/tests/ftest/io/small_file_count.yaml +++ b/src/tests/ftest/io/small_file_count.yaml @@ -25,7 +25,6 @@ pool: container: type: POSIX - control_method: daos largefilecount: api: diff --git a/src/tests/ftest/ior/crash.yaml b/src/tests/ftest/ior/crash.yaml index 62c9c23f1f6..7814942e67c 100644 --- a/src/tests/ftest/ior/crash.yaml +++ b/src/tests/ftest/ior/crash.yaml @@ -26,7 +26,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/ior/hard.yaml b/src/tests/ftest/ior/hard.yaml index 71394243cff..db2f39e32a9 100644 --- a/src/tests/ftest/ior/hard.yaml +++ b/src/tests/ftest/ior/hard.yaml @@ -34,7 +34,6 @@ pool: container: type: POSIX - control_method: daos properties: dedup:memcmp ior: diff --git a/src/tests/ftest/ior/hard_rebuild.yaml b/src/tests/ftest/ior/hard_rebuild.yaml index 32665ab18ad..6f47fd4d82a 100644 --- a/src/tests/ftest/ior/hard_rebuild.yaml +++ b/src/tests/ftest/ior/hard_rebuild.yaml @@ -36,7 +36,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/ior/intercept_messages.yaml b/src/tests/ftest/ior/intercept_messages.yaml index 0b7884c5311..bbb3beda94e 100644 --- a/src/tests/ftest/ior/intercept_messages.yaml +++ b/src/tests/ftest/ior/intercept_messages.yaml @@ -15,7 +15,6 @@ pool: svcn: 1 container: type: POSIX - control_method: daos ior: env_vars: - D_LOG_MASK=INFO diff --git a/src/tests/ftest/ior/intercept_messages_pil4dfs.yaml b/src/tests/ftest/ior/intercept_messages_pil4dfs.yaml index 6dbe12c4f8c..d9aa1297386 100644 --- a/src/tests/ftest/ior/intercept_messages_pil4dfs.yaml +++ b/src/tests/ftest/ior/intercept_messages_pil4dfs.yaml @@ -15,7 +15,6 @@ pool: svcn: 1 container: type: POSIX - control_method: daos ior: env_vars: - D_LOG_MASK=INFO diff --git a/src/tests/ftest/mpiio/hdf5.yaml b/src/tests/ftest/mpiio/hdf5.yaml index 2bbdc9bd9ac..bc8be8b5ce9 100644 --- a/src/tests/ftest/mpiio/hdf5.yaml +++ b/src/tests/ftest/mpiio/hdf5.yaml @@ -23,7 +23,6 @@ pool: svcn: 1 container: type: POSIX - control_method: daos client_processes: np: 6 test_repo: diff --git a/src/tests/ftest/mpiio/llnl_mpi4py.yaml b/src/tests/ftest/mpiio/llnl_mpi4py.yaml index 50ef63fd14c..6ff934cfc74 100644 --- a/src/tests/ftest/mpiio/llnl_mpi4py.yaml +++ b/src/tests/ftest/mpiio/llnl_mpi4py.yaml @@ -18,7 +18,6 @@ pool: scm_size: 1000000000 container: type: POSIX - control_method: daos client_processes: np: 8 test_repo: diff --git a/src/tests/ftest/mpiio/romio.yaml b/src/tests/ftest/mpiio/romio.yaml index c73387764d1..2cf02ef5596 100644 --- a/src/tests/ftest/mpiio/romio.yaml +++ b/src/tests/ftest/mpiio/romio.yaml @@ -16,6 +16,5 @@ pool: svcn: 1 container: type: POSIX - control_method: daos romio: romio_repo: "romio/test/" diff --git a/src/tests/ftest/nvme/enospace.yaml b/src/tests/ftest/nvme/enospace.yaml index 396ddee7cfc..9573e231787 100644 --- a/src/tests/ftest/nvme/enospace.yaml +++ b/src/tests/ftest/nvme/enospace.yaml @@ -41,7 +41,6 @@ pool: usage_min_nvme: 96 container: - control_method: daos register_cleanup: False # Skip teardown destroy. Test manually destroys containers. type: POSIX diff --git a/src/tests/ftest/nvme/fault.yaml b/src/tests/ftest/nvme/fault.yaml index 8082a22b718..5e6e2d1a7a7 100644 --- a/src/tests/ftest/nvme/fault.yaml +++ b/src/tests/ftest/nvme/fault.yaml @@ -21,7 +21,6 @@ pool: size: 96% container: type: POSIX - control_method: daos properties: rd_fac:1 ior: api: DFS diff --git a/src/tests/ftest/nvme/fragmentation.yaml b/src/tests/ftest/nvme/fragmentation.yaml index 279f2c50498..0bbe6ba2389 100644 --- a/src/tests/ftest/nvme/fragmentation.yaml +++ b/src/tests/ftest/nvme/fragmentation.yaml @@ -24,7 +24,6 @@ pool: container: type: POSIX - control_method: daos ior: num_repeat: 30 diff --git a/src/tests/ftest/nvme/io_verification.yaml b/src/tests/ftest/nvme/io_verification.yaml index 48fbb787825..c143c62b0ef 100644 --- a/src/tests/ftest/nvme/io_verification.yaml +++ b/src/tests/ftest/nvme/io_verification.yaml @@ -36,7 +36,6 @@ pool_3: container: type: POSIX - control_method: daos ior: client_processes: diff --git a/src/tests/ftest/nvme/pool_capacity.yaml b/src/tests/ftest/nvme/pool_capacity.yaml index cfe5c31704f..e21bc60522c 100644 --- a/src/tests/ftest/nvme/pool_capacity.yaml +++ b/src/tests/ftest/nvme/pool_capacity.yaml @@ -34,7 +34,6 @@ pool_qty_10: container: type: POSIX - control_method: daos ior: no_parallel_job: 10 diff --git a/src/tests/ftest/nvme/pool_exclude.yaml b/src/tests/ftest/nvme/pool_exclude.yaml index 516693038f8..b306687c60f 100644 --- a/src/tests/ftest/nvme/pool_exclude.yaml +++ b/src/tests/ftest/nvme/pool_exclude.yaml @@ -37,7 +37,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 ior_flags_common: &ior_flags_common diff --git a/src/tests/ftest/nvme/pool_extend.yaml b/src/tests/ftest/nvme/pool_extend.yaml index 1dfdfac813f..fd2af7bf5f9 100644 --- a/src/tests/ftest/nvme/pool_extend.yaml +++ b/src/tests/ftest/nvme/pool_extend.yaml @@ -45,7 +45,6 @@ pool_qty_3: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 ior_flags_common: &ior_flags_common diff --git a/src/tests/ftest/object/same_key_different_value.yaml b/src/tests/ftest/object/same_key_different_value.yaml index b2b5e075028..41f193a9529 100644 --- a/src/tests/ftest/object/same_key_different_value.yaml +++ b/src/tests/ftest/object/same_key_different_value.yaml @@ -16,5 +16,3 @@ server_config: system_ram_reserved: 1 pool: scm_size: 160000000 -container: - control_method: daos diff --git a/src/tests/ftest/osa/offline_drain.yaml b/src/tests/ftest/osa/offline_drain.yaml index ab17208fc4a..9227bfc467f 100644 --- a/src/tests/ftest/osa/offline_drain.yaml +++ b/src/tests/ftest/osa/offline_drain.yaml @@ -39,7 +39,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_3G6 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:2 diff --git a/src/tests/ftest/osa/offline_extend.yaml b/src/tests/ftest/osa/offline_extend.yaml index a5dd0348b9a..0645c3778b2 100644 --- a/src/tests/ftest/osa/offline_extend.yaml +++ b/src/tests/ftest/osa/offline_extend.yaml @@ -41,7 +41,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2G1 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:1 diff --git a/src/tests/ftest/osa/offline_parallel_test.yaml b/src/tests/ftest/osa/offline_parallel_test.yaml index 393e2af88b1..690ec03e797 100644 --- a/src/tests/ftest/osa/offline_parallel_test.yaml +++ b/src/tests/ftest/osa/offline_parallel_test.yaml @@ -40,7 +40,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2G8 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:1 diff --git a/src/tests/ftest/osa/offline_reintegration.yaml b/src/tests/ftest/osa/offline_reintegration.yaml index ddca2f23e18..8968bd43be7 100644 --- a/src/tests/ftest/osa/offline_reintegration.yaml +++ b/src/tests/ftest/osa/offline_reintegration.yaml @@ -53,7 +53,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_3G6 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:2 diff --git a/src/tests/ftest/osa/online_drain.yaml b/src/tests/ftest/osa/online_drain.yaml index 2f46b283f0a..484ad1a1bdb 100644 --- a/src/tests/ftest/osa/online_drain.yaml +++ b/src/tests/ftest/osa/online_drain.yaml @@ -39,7 +39,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 oclass: RP_2G4 diff --git a/src/tests/ftest/osa/online_extend.yaml b/src/tests/ftest/osa/online_extend.yaml index 2224177be92..3b5b0e19138 100644 --- a/src/tests/ftest/osa/online_extend.yaml +++ b/src/tests/ftest/osa/online_extend.yaml @@ -50,7 +50,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 oclass: RP_2G1 diff --git a/src/tests/ftest/osa/online_parallel_test.yaml b/src/tests/ftest/osa/online_parallel_test.yaml index cee62c00497..67ab6268d1f 100644 --- a/src/tests/ftest/osa/online_parallel_test.yaml +++ b/src/tests/ftest/osa/online_parallel_test.yaml @@ -37,7 +37,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on oclass: RP_2G1 diff --git a/src/tests/ftest/osa/online_reintegration.yaml b/src/tests/ftest/osa/online_reintegration.yaml index af79f74ff14..2105075f3fb 100644 --- a/src/tests/ftest/osa/online_reintegration.yaml +++ b/src/tests/ftest/osa/online_reintegration.yaml @@ -40,7 +40,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 oclass: RP_2G1 diff --git a/src/tests/ftest/performance/ior_easy.yaml b/src/tests/ftest/performance/ior_easy.yaml index 139f199f53e..c6b06d2b8cb 100644 --- a/src/tests/ftest/performance/ior_easy.yaml +++ b/src/tests/ftest/performance/ior_easy.yaml @@ -28,7 +28,6 @@ pool: container: type: POSIX - control_method: daos ior: &ior_base client_processes: diff --git a/src/tests/ftest/performance/ior_hard.yaml b/src/tests/ftest/performance/ior_hard.yaml index deeb807bded..cc610466cf0 100644 --- a/src/tests/ftest/performance/ior_hard.yaml +++ b/src/tests/ftest/performance/ior_hard.yaml @@ -28,7 +28,6 @@ pool: container: type: POSIX - control_method: daos ior: &ior_base client_processes: diff --git a/src/tests/ftest/performance/mdtest_easy.yaml b/src/tests/ftest/performance/mdtest_easy.yaml index 8b70c5723a4..4def81f05a3 100644 --- a/src/tests/ftest/performance/mdtest_easy.yaml +++ b/src/tests/ftest/performance/mdtest_easy.yaml @@ -28,7 +28,6 @@ pool: container: type: POSIX - control_method: daos mdtest: &mdtest_base client_processes: diff --git a/src/tests/ftest/performance/mdtest_hard.yaml b/src/tests/ftest/performance/mdtest_hard.yaml index 505ecb49bd8..d4b162571e7 100644 --- a/src/tests/ftest/performance/mdtest_hard.yaml +++ b/src/tests/ftest/performance/mdtest_hard.yaml @@ -28,7 +28,6 @@ pool: container: type: POSIX - control_method: daos mdtest: &mdtest_base client_processes: diff --git a/src/tests/ftest/pool/destroy.yaml b/src/tests/ftest/pool/destroy.yaml index f2da22876bd..a2452bad188 100644 --- a/src/tests/ftest/pool/destroy.yaml +++ b/src/tests/ftest/pool/destroy.yaml @@ -25,7 +25,6 @@ container: akey_size: 4 dkey_size: 4 data_size: 9 - control_method: daos setnames: validsetname: setname: daos_server diff --git a/src/tests/ftest/pool/list_verbose.yaml b/src/tests/ftest/pool/list_verbose.yaml index fdd9b4f4fa8..1d55aa2d839 100644 --- a/src/tests/ftest/pool/list_verbose.yaml +++ b/src/tests/ftest/pool/list_verbose.yaml @@ -32,7 +32,6 @@ pool_scm_only: target_list: [0] container: - control_method: daos type: POSIX oclass: S1 diff --git a/src/tests/ftest/pool/pda.yaml b/src/tests/ftest/pool/pda.yaml index 3b98ced5bfc..afc2aa7ee09 100644 --- a/src/tests/ftest/pool/pda.yaml +++ b/src/tests/ftest/pool/pda.yaml @@ -21,10 +21,8 @@ pool_1: properties: rd_fac:0,space_rb:0,ec_pda:2,rp_pda:4 container: type: POSIX - control_method: daos container_1: type: POSIX pda_properties: - 3 # ec_pda - 5 # rp_pda - control_method: daos diff --git a/src/tests/ftest/pool/target_query.yaml b/src/tests/ftest/pool/target_query.yaml index d146f50c38f..0720d3a2893 100644 --- a/src/tests/ftest/pool/target_query.yaml +++ b/src/tests/ftest/pool/target_query.yaml @@ -28,7 +28,6 @@ pool: container: type: POSIX - control_method: daos ior: api: "DFS" diff --git a/src/tests/ftest/pool/verify_space.yaml b/src/tests/ftest/pool/verify_space.yaml index 9cb6a6e13f2..1232408cff7 100644 --- a/src/tests/ftest/pool/verify_space.yaml +++ b/src/tests/ftest/pool/verify_space.yaml @@ -37,7 +37,6 @@ pool_rank_0_1_2: container: type: POSIX - control_method: daos register_cleanup: False ior: diff --git a/src/tests/ftest/pytorch/checkpoint.yaml b/src/tests/ftest/pytorch/checkpoint.yaml index 76c4b9c07d4..9777d7c4dbb 100644 --- a/src/tests/ftest/pytorch/checkpoint.yaml +++ b/src/tests/ftest/pytorch/checkpoint.yaml @@ -17,7 +17,6 @@ pool: size: 8G container: type: POSIX - control_method: daos timeout: 2000 diff --git a/src/tests/ftest/pytorch/dataset.yaml b/src/tests/ftest/pytorch/dataset.yaml index 04db280f123..99e4e0def56 100644 --- a/src/tests/ftest/pytorch/dataset.yaml +++ b/src/tests/ftest/pytorch/dataset.yaml @@ -17,7 +17,6 @@ pool: size: 8G container: type: POSIX - control_method: daos dir_oclass: SX timeout: 270 diff --git a/src/tests/ftest/rebuild/container_create_race.yaml b/src/tests/ftest/rebuild/container_create_race.yaml index 892af3461e0..79ab7c918a2 100644 --- a/src/tests/ftest/rebuild/container_create_race.yaml +++ b/src/tests/ftest/rebuild/container_create_race.yaml @@ -32,7 +32,6 @@ pool: container: type: POSIX - control_method: daos io: object_qty: 8 diff --git a/src/tests/ftest/rebuild/container_rf.yaml b/src/tests/ftest/rebuild/container_rf.yaml index ce318786cc3..60ff9dba091 100644 --- a/src/tests/ftest/rebuild/container_rf.yaml +++ b/src/tests/ftest/rebuild/container_rf.yaml @@ -20,7 +20,6 @@ pool: svcn: 7 # To match number of servers pool_query_timeout: 30 container: - control_method: daos cont_prop: !mux rf_1: properties: rd_fac:1 diff --git a/src/tests/ftest/rebuild/continues_after_stop.yaml b/src/tests/ftest/rebuild/continues_after_stop.yaml index 1bf71021410..5197af54f95 100644 --- a/src/tests/ftest/rebuild/continues_after_stop.yaml +++ b/src/tests/ftest/rebuild/continues_after_stop.yaml @@ -27,7 +27,6 @@ pool: container: type: POSIX - control_method: daos ior: flags: -w diff --git a/src/tests/ftest/rebuild/mdtest.yaml b/src/tests/ftest/rebuild/mdtest.yaml index e0c921fa3f8..52c8eee1ae5 100644 --- a/src/tests/ftest/rebuild/mdtest.yaml +++ b/src/tests/ftest/rebuild/mdtest.yaml @@ -31,7 +31,6 @@ pool: container: type: POSIX - control_method: daos mpirun: args: "--bind-to hwthread --map-by socket" diff --git a/src/tests/ftest/rebuild/no_cap.yaml b/src/tests/ftest/rebuild/no_cap.yaml index 2f4f287a5a8..c9fe50111a4 100644 --- a/src/tests/ftest/rebuild/no_cap.yaml +++ b/src/tests/ftest/rebuild/no_cap.yaml @@ -27,7 +27,6 @@ server_config: storage: auto container: - control_method: daos properties: "rd_fac:1" pool: diff --git a/src/tests/ftest/rebuild/pool_destroy_race.yaml b/src/tests/ftest/rebuild/pool_destroy_race.yaml index 987332712e8..82ccc7f4271 100644 --- a/src/tests/ftest/rebuild/pool_destroy_race.yaml +++ b/src/tests/ftest/rebuild/pool_destroy_race.yaml @@ -35,7 +35,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2GX ior_write: diff --git a/src/tests/ftest/rebuild/widely_striped.yaml b/src/tests/ftest/rebuild/widely_striped.yaml index 72ceeda3b68..a031d508cd1 100644 --- a/src/tests/ftest/rebuild/widely_striped.yaml +++ b/src/tests/ftest/rebuild/widely_striped.yaml @@ -26,7 +26,6 @@ pool: properties: rd_fac:2 container: type: POSIX - control_method: daos oclass: RP_3G1 properties: rd_fac:2 mdtest: diff --git a/src/tests/ftest/rebuild/with_io.yaml b/src/tests/ftest/rebuild/with_io.yaml index 49e793285ef..285e207aba1 100644 --- a/src/tests/ftest/rebuild/with_io.yaml +++ b/src/tests/ftest/rebuild/with_io.yaml @@ -19,7 +19,6 @@ pool: pool_query_timeout: 30 container: properties: rd_fac:2 - control_method: daos akey_size: 5 dkey_size: 5 data_size: 256 diff --git a/src/tests/ftest/rebuild/with_ior.yaml b/src/tests/ftest/rebuild/with_ior.yaml index 34c6f2d9eda..67cbbdf0762 100644 --- a/src/tests/ftest/rebuild/with_ior.yaml +++ b/src/tests/ftest/rebuild/with_ior.yaml @@ -35,7 +35,6 @@ pool: container: type: POSIX properties: rd_fac:1 - control_method: daos ior: ior_timeout: 120 diff --git a/src/tests/ftest/recovery/check_policy.yaml b/src/tests/ftest/recovery/check_policy.yaml index 55d0111c106..8a4e252821d 100644 --- a/src/tests/ftest/recovery/check_policy.yaml +++ b/src/tests/ftest/recovery/check_policy.yaml @@ -18,6 +18,3 @@ server_config: pool: size: 60G - -container: - control_method: daos diff --git a/src/tests/ftest/recovery/check_start_corner_case.yaml b/src/tests/ftest/recovery/check_start_corner_case.yaml index ed1816f3b8c..5e37ff1bb6f 100644 --- a/src/tests/ftest/recovery/check_start_corner_case.yaml +++ b/src/tests/ftest/recovery/check_start_corner_case.yaml @@ -22,4 +22,3 @@ pool: container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/recovery/check_start_options.yaml b/src/tests/ftest/recovery/check_start_options.yaml index ad603b0d728..0a0647caa81 100644 --- a/src/tests/ftest/recovery/check_start_options.yaml +++ b/src/tests/ftest/recovery/check_start_options.yaml @@ -17,6 +17,3 @@ server_config: pool: size: 60G - -container: - control_method: daos diff --git a/src/tests/ftest/recovery/check_stop.yaml b/src/tests/ftest/recovery/check_stop.yaml index d4ba8437916..f0a251d6315 100644 --- a/src/tests/ftest/recovery/check_stop.yaml +++ b/src/tests/ftest/recovery/check_stop.yaml @@ -22,4 +22,3 @@ pool: container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/recovery/container_cleanup.yaml b/src/tests/ftest/recovery/container_cleanup.yaml index 5a2a97b4619..f8eb4c10a84 100644 --- a/src/tests/ftest/recovery/container_cleanup.yaml +++ b/src/tests/ftest/recovery/container_cleanup.yaml @@ -18,4 +18,3 @@ pool: container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/recovery/container_list_consolidation.yaml b/src/tests/ftest/recovery/container_list_consolidation.yaml index 5a2a97b4619..f8eb4c10a84 100644 --- a/src/tests/ftest/recovery/container_list_consolidation.yaml +++ b/src/tests/ftest/recovery/container_list_consolidation.yaml @@ -18,4 +18,3 @@ pool: container: type: POSIX - control_method: daos diff --git a/src/tests/ftest/recovery/pool_list_consolidation.yaml b/src/tests/ftest/recovery/pool_list_consolidation.yaml index c3d0af6f2f6..10d71d12ebd 100644 --- a/src/tests/ftest/recovery/pool_list_consolidation.yaml +++ b/src/tests/ftest/recovery/pool_list_consolidation.yaml @@ -26,6 +26,3 @@ setup: pool: size: 100G - -container: - control_method: daos diff --git a/src/tests/ftest/recovery/pool_membership.yaml b/src/tests/ftest/recovery/pool_membership.yaml index e14024b8109..261dee814ce 100644 --- a/src/tests/ftest/recovery/pool_membership.yaml +++ b/src/tests/ftest/recovery/pool_membership.yaml @@ -22,7 +22,6 @@ pool: size: 100G container: - control_method: daos type: POSIX ior: diff --git a/src/tests/ftest/scrubber/aggregation.yaml b/src/tests/ftest/scrubber/aggregation.yaml index cfee3de68f8..e0a95ade923 100644 --- a/src/tests/ftest/scrubber/aggregation.yaml +++ b/src/tests/ftest/scrubber/aggregation.yaml @@ -38,7 +38,6 @@ pool: container: type: POSIX - control_method: daos properties: "cksum:sha512,rd_fac:1" ior: &ior_base diff --git a/src/tests/ftest/scrubber/basic.yaml b/src/tests/ftest/scrubber/basic.yaml index 60a98eb3142..6852797d286 100644 --- a/src/tests/ftest/scrubber/basic.yaml +++ b/src/tests/ftest/scrubber/basic.yaml @@ -49,7 +49,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2G1 properties: cksum:crc16 diff --git a/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml b/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml index befb63d1942..67d28b1703b 100644 --- a/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml +++ b/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml @@ -34,7 +34,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2G1 properties: cksum:crc16,cksum_size:16384,srv_cksum:on diff --git a/src/tests/ftest/scrubber/csum_fault.yaml b/src/tests/ftest/scrubber/csum_fault.yaml index 407d8b7b414..bd92d951fe6 100644 --- a/src/tests/ftest/scrubber/csum_fault.yaml +++ b/src/tests/ftest/scrubber/csum_fault.yaml @@ -50,7 +50,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2GX properties: "cksum:crc16" diff --git a/src/tests/ftest/scrubber/frequency.yaml b/src/tests/ftest/scrubber/frequency.yaml index befbe818106..35d298a40bf 100644 --- a/src/tests/ftest/scrubber/frequency.yaml +++ b/src/tests/ftest/scrubber/frequency.yaml @@ -38,7 +38,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2G1 ior: diff --git a/src/tests/ftest/scrubber/rebuild.yaml b/src/tests/ftest/scrubber/rebuild.yaml index 159a7df504d..23191ad2597 100644 --- a/src/tests/ftest/scrubber/rebuild.yaml +++ b/src/tests/ftest/scrubber/rebuild.yaml @@ -40,7 +40,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2GX properties: "cksum:sha256,rd_fac:1" diff --git a/src/tests/ftest/scrubber/snapshot.yaml b/src/tests/ftest/scrubber/snapshot.yaml index f286212e5a1..1e841b63c73 100644 --- a/src/tests/ftest/scrubber/snapshot.yaml +++ b/src/tests/ftest/scrubber/snapshot.yaml @@ -40,7 +40,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2GX properties: "cksum:crc64,rd_fac:1" diff --git a/src/tests/ftest/scrubber/target_auto_eviction.yaml b/src/tests/ftest/scrubber/target_auto_eviction.yaml index dc1e80d4429..a455f1e7e80 100644 --- a/src/tests/ftest/scrubber/target_auto_eviction.yaml +++ b/src/tests/ftest/scrubber/target_auto_eviction.yaml @@ -50,7 +50,6 @@ pool: container: type: POSIX - control_method: daos oclass: RP_2GX properties: "cksum:crc16" diff --git a/src/tests/ftest/security/cont_acl.yaml b/src/tests/ftest/security/cont_acl.yaml index a767b32a63a..ddd5cb08a22 100644 --- a/src/tests/ftest/security/cont_acl.yaml +++ b/src/tests/ftest/security/cont_acl.yaml @@ -20,8 +20,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 138374182 -container: - control_method: daos container_acl: acl_file_name: cont_test_acl1.txt new_user: root diff --git a/src/tests/ftest/security/cont_create_acl.yaml b/src/tests/ftest/security/cont_create_acl.yaml index 4eedd0342d8..1e896fa9ca1 100644 --- a/src/tests/ftest/security/cont_create_acl.yaml +++ b/src/tests/ftest/security/cont_create_acl.yaml @@ -17,5 +17,3 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 -container: - control_method: daos diff --git a/src/tests/ftest/security/cont_delete_acl.yaml b/src/tests/ftest/security/cont_delete_acl.yaml index ddf182f20a8..c35c265fc98 100644 --- a/src/tests/ftest/security/cont_delete_acl.yaml +++ b/src/tests/ftest/security/cont_delete_acl.yaml @@ -19,7 +19,6 @@ server_config: pool: scm_size: 2G container: - control_method: daos type: POSIX invalid_principals: diff --git a/src/tests/ftest/security/cont_get_acl.yaml b/src/tests/ftest/security/cont_get_acl.yaml index de57fac3fca..0d396ffb782 100644 --- a/src/tests/ftest/security/cont_get_acl.yaml +++ b/src/tests/ftest/security/cont_get_acl.yaml @@ -20,7 +20,6 @@ server_config: pool: scm_size: 2G container: - control_method: daos type: POSIX valid_out_filename: diff --git a/src/tests/ftest/security/cont_overwrite_acl.yaml b/src/tests/ftest/security/cont_overwrite_acl.yaml index 5b6252bddaa..0d071dbe977 100644 --- a/src/tests/ftest/security/cont_overwrite_acl.yaml +++ b/src/tests/ftest/security/cont_overwrite_acl.yaml @@ -20,7 +20,6 @@ server_config: pool: scm_size: 1G container: - control_method: daos type: POSIX invalid_acl_filename: diff --git a/src/tests/ftest/security/cont_owner.yaml b/src/tests/ftest/security/cont_owner.yaml index 4a086144711..da233a37c9b 100644 --- a/src/tests/ftest/security/cont_owner.yaml +++ b/src/tests/ftest/security/cont_owner.yaml @@ -18,5 +18,3 @@ server_config: system_ram_reserved: 1 pool: size: 1G -container: - control_method: daos diff --git a/src/tests/ftest/security/cont_update_acl.yaml b/src/tests/ftest/security/cont_update_acl.yaml index 6a8f2069e33..c1ef8bcbb9e 100644 --- a/src/tests/ftest/security/cont_update_acl.yaml +++ b/src/tests/ftest/security/cont_update_acl.yaml @@ -20,7 +20,6 @@ server_config: pool: scm_size: 1G container: - control_method: daos type: POSIX invalid_acl_entries: diff --git a/src/tests/ftest/security/pool_acl.yaml b/src/tests/ftest/security/pool_acl.yaml index 2f58323be57..f253d535793 100644 --- a/src/tests/ftest/security/pool_acl.yaml +++ b/src/tests/ftest/security/pool_acl.yaml @@ -27,8 +27,6 @@ server_config: # dmg: # transport_config: # allow_insecure: False -container: - control_method: daos pool_acl: scm_size: 134217728 user_prefix: daos_ci diff --git a/src/tests/ftest/security/pool_groups.yaml b/src/tests/ftest/security/pool_groups.yaml index 81a5b3a2b30..caa6413ed03 100644 --- a/src/tests/ftest/security/pool_groups.yaml +++ b/src/tests/ftest/security/pool_groups.yaml @@ -16,8 +16,6 @@ server_config: scm_mount: /mnt/daos scm_size: 4 system_ram_reserved: 1 -container: - control_method: daos pool_acl: scm_size: 134217728 user_prefix: daos_ci diff --git a/src/tests/ftest/server/cpu_usage.yaml b/src/tests/ftest/server/cpu_usage.yaml index ec11f001e14..b57978b9e7a 100644 --- a/src/tests/ftest/server/cpu_usage.yaml +++ b/src/tests/ftest/server/cpu_usage.yaml @@ -25,6 +25,5 @@ pool: container: type: POSIX - control_method: daos usage_limit: 200 diff --git a/src/tests/ftest/server/daos_server_restart.yaml b/src/tests/ftest/server/daos_server_restart.yaml index 99263715abf..408b6c3fdee 100644 --- a/src/tests/ftest/server/daos_server_restart.yaml +++ b/src/tests/ftest/server/daos_server_restart.yaml @@ -29,6 +29,3 @@ server: pool: size: 100GB - -container: - control_method: daos diff --git a/src/tests/ftest/server/multiengine_persocket.yaml b/src/tests/ftest/server/multiengine_persocket.yaml index e850019ce67..fdd1a180e4f 100644 --- a/src/tests/ftest/server/multiengine_persocket.yaml +++ b/src/tests/ftest/server/multiengine_persocket.yaml @@ -88,7 +88,6 @@ pool: name: daos_server container: - control_method: daos type: POSIX properties: rf:0 num_attributes: 20 diff --git a/src/tests/ftest/soak/faults.yaml b/src/tests/ftest/soak/faults.yaml index 4ce3c4880d6..da1f161ecac 100644 --- a/src/tests/ftest/soak/faults.yaml +++ b/src/tests/ftest/soak/faults.yaml @@ -43,13 +43,11 @@ pool_reserved: container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on - control_method: daos container_reserved: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 file_oclass: EC_2P1GX dir_oclass: RP_2GX - control_method: daos faults: fault_list: # - DAOS_DTX_LOST_RPC_REQUEST diff --git a/src/tests/ftest/soak/harassers.yaml b/src/tests/ftest/soak/harassers.yaml index a2032e85d61..bad690909b5 100644 --- a/src/tests/ftest/soak/harassers.yaml +++ b/src/tests/ftest/soak/harassers.yaml @@ -49,14 +49,12 @@ pool_reserved: container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on - control_method: daos daos_timeout: 30 container_reserved: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 file_oclass: EC_2P2GX dir_oclass: RP_3GX - control_method: daos daos_timeout: 30 # test_params - Defines the type of test to run and how long it runs # It also defines how many pools and jobs to create diff --git a/src/tests/ftest/soak/smoke.yaml b/src/tests/ftest/soak/smoke.yaml index 948fe1f8802..3257b47e368 100644 --- a/src/tests/ftest/soak/smoke.yaml +++ b/src/tests/ftest/soak/smoke.yaml @@ -47,13 +47,11 @@ pool_racer: container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on - control_method: daos container_reserved: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 file_oclass: EC_2P1GX dir_oclass: RP_2GX - control_method: daos # test_params - Defines the type of test to run and how long it runs # It also defines how many pools and jobs to create # name: The name of the Avocado testcase diff --git a/src/tests/ftest/soak/stress.yaml b/src/tests/ftest/soak/stress.yaml index b3e9b87dd91..c53d8b02bea 100644 --- a/src/tests/ftest/soak/stress.yaml +++ b/src/tests/ftest/soak/stress.yaml @@ -52,13 +52,11 @@ pool_racer: container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on - control_method: daos container_reserved: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 file_oclass: EC_2P1GX dir_oclass: RP_2GX - control_method: daos # test_params - Defines the type of test to run and how long it runs # It also defines how many pools and jobs to create # name: The name of the Avocado testcase diff --git a/src/tests/ftest/soak/stress_2h.yaml b/src/tests/ftest/soak/stress_2h.yaml index fd34958f368..09789cf2ea6 100644 --- a/src/tests/ftest/soak/stress_2h.yaml +++ b/src/tests/ftest/soak/stress_2h.yaml @@ -38,13 +38,11 @@ pool_reserved: container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on - control_method: daos container_reserved: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 file_oclass: SX dir_oclass: SX - control_method: daos daos_timeout: 30 # test_params - Defines the type of test to run and how long it runs # It also defines how many pools and jobs to create diff --git a/src/tests/ftest/telemetry/basic_client_telemetry.yaml b/src/tests/ftest/telemetry/basic_client_telemetry.yaml index d585dc81fda..e0dd33d1f87 100644 --- a/src/tests/ftest/telemetry/basic_client_telemetry.yaml +++ b/src/tests/ftest/telemetry/basic_client_telemetry.yaml @@ -27,7 +27,6 @@ pool: container: type: POSIX - control_method: daos dfs_oclass: SX ior: &ior_base diff --git a/src/tests/ftest/telemetry/telemetry_pool_metrics.yaml b/src/tests/ftest/telemetry/telemetry_pool_metrics.yaml index ebdab1d808a..65eaf391470 100644 --- a/src/tests/ftest/telemetry/telemetry_pool_metrics.yaml +++ b/src/tests/ftest/telemetry/telemetry_pool_metrics.yaml @@ -18,7 +18,6 @@ pool: scm_size: 5G container: type: POSIX - control_method: daos replication: !mux rf0: properties: rd_fac:0 diff --git a/src/tests/ftest/telemetry/wal_metrics.yaml b/src/tests/ftest/telemetry/wal_metrics.yaml index 1f991444383..4ab0c61eaee 100644 --- a/src/tests/ftest/telemetry/wal_metrics.yaml +++ b/src/tests/ftest/telemetry/wal_metrics.yaml @@ -14,7 +14,6 @@ pool: size: 40G container: - control_method: daos type: POSIX dfs_oclass: SX diff --git a/src/tests/ftest/vmd/fault_reintegration.yaml b/src/tests/ftest/vmd/fault_reintegration.yaml index 76a41281794..6b6061079a8 100644 --- a/src/tests/ftest/vmd/fault_reintegration.yaml +++ b/src/tests/ftest/vmd/fault_reintegration.yaml @@ -30,7 +30,6 @@ pool: container: type: POSIX - control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 file_oclass: RP_3G1 dir_oclass: RP_3G1 diff --git a/src/tests/ftest/vmd/led.yaml b/src/tests/ftest/vmd/led.yaml index e77437e6a35..bb859c03b95 100644 --- a/src/tests/ftest/vmd/led.yaml +++ b/src/tests/ftest/vmd/led.yaml @@ -44,7 +44,6 @@ pool: container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on - control_method: daos dfuse: disable_caching: True