diff --git a/src/tests/ftest/aggregation/continuous_write.yaml b/src/tests/ftest/aggregation/continuous_write.yaml index 4e8e76ff4f9..713359c460f 100644 --- a/src/tests/ftest/aggregation/continuous_write.yaml +++ b/src/tests/ftest/aggregation/continuous_write.yaml @@ -11,8 +11,6 @@ server_config: 0: targets: 1 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server_0.log storage: auto diff --git a/src/tests/ftest/aggregation/multiple_pool_cont.yaml b/src/tests/ftest/aggregation/multiple_pool_cont.yaml index 990c2f0c88c..e53532397f3 100644 --- a/src/tests/ftest/aggregation/multiple_pool_cont.yaml +++ b/src/tests/ftest/aggregation/multiple_pool_cont.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 1300 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +15,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -23,20 +24,21 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: size: 40% svcn: 1 control_method: dmg + container: type: POSIX control_method: daos + ior: client_processes: np: 12 @@ -48,5 +50,6 @@ ior: block_size: '512M' dfs_oclass: "EC_2P1G1" dfs_dir_oclass: "EC_2P1G1" + runtime: total_runtime: 800 # total seconds to run diff --git a/src/tests/ftest/aggregation/space_rb.yaml b/src/tests/ftest/aggregation/space_rb.yaml index c415cfc2418..dc3ae51c592 100644 --- a/src/tests/ftest/aggregation/space_rb.yaml +++ b/src/tests/ftest/aggregation/space_rb.yaml @@ -11,8 +11,6 @@ server_config: 0: targets: 4 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server_0.log storage: auto diff --git a/src/tests/ftest/container/multiple_delete.yaml b/src/tests/ftest/container/multiple_delete.yaml index 3c5375fffe0..3326d8b3eda 100644 --- a/src/tests/ftest/container/multiple_delete.yaml +++ b/src/tests/ftest/container/multiple_delete.yaml @@ -11,16 +11,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: INFO storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: INFO storage: auto diff --git a/src/tests/ftest/container/per_server_fault_domain.yaml b/src/tests/ftest/container/per_server_fault_domain.yaml index 266e8c8e600..228833bc5cb 100644 --- a/src/tests/ftest/container/per_server_fault_domain.yaml +++ b/src/tests/ftest/container/per_server_fault_domain.yaml @@ -11,15 +11,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server_0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server_1.log storage: auto diff --git a/src/tests/ftest/container/snapshot_aggregation.yaml b/src/tests/ftest/container/snapshot_aggregation.yaml index 8c4fa97c7fc..1963115ee27 100644 --- a/src/tests/ftest/container/snapshot_aggregation.yaml +++ b/src/tests/ftest/container/snapshot_aggregation.yaml @@ -1,7 +1,9 @@ timeout: 360 + hosts: test_servers: 1 test_clients: 3 + server_config: name: daos_server engines_per_host: 2 @@ -10,26 +12,25 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto system_ram_reserved: 8 + pool: control_method: dmg scm_size: 80G nvme_size: 100G target_list: [0, 1] + container: control_method: daos type: POSIX + ior: flags: "-w -k" ppn: 2 diff --git a/src/tests/ftest/control/daos_agent_support_collect_log.yaml b/src/tests/ftest/control/daos_agent_support_collect_log.yaml index 1f6b4134142..e5fe5acce8c 100644 --- a/src/tests/ftest/control/daos_agent_support_collect_log.yaml +++ b/src/tests/ftest/control/daos_agent_support_collect_log.yaml @@ -1,20 +1,18 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 120 + server_config: name: daos_server engines_per_host: 2 engines: 0: pinned_numa_node: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/control/daos_server_support_collect_log.yaml b/src/tests/ftest/control/daos_server_support_collect_log.yaml index 4fc6f224400..9ac8518685c 100644 --- a/src/tests/ftest/control/daos_server_support_collect_log.yaml +++ b/src/tests/ftest/control/daos_server_support_collect_log.yaml @@ -1,19 +1,17 @@ hosts: test_servers: 3 + timeout: 120 + server_config: name: daos_server engines_per_host: 2 engines: 0: pinned_numa_node: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/control/daos_system_query.yaml b/src/tests/ftest/control/daos_system_query.yaml index de11c254170..0427337c650 100644 --- a/src/tests/ftest/control/daos_system_query.yaml +++ b/src/tests/ftest/control/daos_system_query.yaml @@ -9,7 +9,6 @@ server_config: 0: targets: 4 nr_xs_helpers: 0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: diff --git a/src/tests/ftest/control/dmg_scale.yaml b/src/tests/ftest/control/dmg_scale.yaml index 84f4e35bc4d..58ee5e85d20 100644 --- a/src/tests/ftest/control/dmg_scale.yaml +++ b/src/tests/ftest/control/dmg_scale.yaml @@ -15,16 +15,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto targets: 8 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto targets: 8 diff --git a/src/tests/ftest/control/dmg_support_collect_log.yaml b/src/tests/ftest/control/dmg_support_collect_log.yaml index 794ca16cacc..913693122b7 100644 --- a/src/tests/ftest/control/dmg_support_collect_log.yaml +++ b/src/tests/ftest/control/dmg_support_collect_log.yaml @@ -1,19 +1,17 @@ hosts: test_servers: 3 + timeout: 200 + server_config: name: daos_server engines_per_host: 2 engines: 0: pinned_numa_node: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/control/dmg_system_start.yaml b/src/tests/ftest/control/dmg_system_start.yaml index a741830e835..5acb169f123 100644 --- a/src/tests/ftest/control/dmg_system_start.yaml +++ b/src/tests/ftest/control/dmg_system_start.yaml @@ -5,7 +5,6 @@ server_config: engines_per_host: 2 engines: 0: - fabric_iface_port: 31416 log_file: daos_server0.log targets: 4 nr_xs_helpers: 0 @@ -14,7 +13,6 @@ server_config: class: ram scm_mount: /mnt/daos0 1: - fabric_iface_port: 31516 log_file: daos_server1.log targets: 4 nr_xs_helpers: 0 diff --git a/src/tests/ftest/control/dmg_telemetry_io_basic.yaml b/src/tests/ftest/control/dmg_telemetry_io_basic.yaml index ac1529b01ee..a11d9fef932 100644 --- a/src/tests/ftest/control/dmg_telemetry_io_basic.yaml +++ b/src/tests/ftest/control/dmg_telemetry_io_basic.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 1 test_clients: 1 + timeout: 150 + server_config: name: daos_server engines_per_host: 2 @@ -9,26 +11,27 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: scm_size: 2G + container: type: POSIX control_method: daos + block_sizes: [10M, 500M] transfer_sizes: [256K, 1M] + telemetry_metrics: io_test_metrics_valid: [0, 18446744073709552000] + ior: api: POSIX flags: "-v -w -k" diff --git a/src/tests/ftest/daos_perf/large.yaml b/src/tests/ftest/daos_perf/large.yaml index 1d907674051..2045e2c7b7b 100644 --- a/src/tests/ftest/daos_perf/large.yaml +++ b/src/tests/ftest/daos_perf/large.yaml @@ -1,9 +1,11 @@ hosts: test_servers: 2 test_clients: 2 + # some run can take long to run, but needs to be verified # by running consecutively for accurate time. timeout: 3600 + job_manager: class_name: Orterun mpi_type: openmpi @@ -21,8 +23,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: 0: @@ -32,8 +32,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: 0: diff --git a/src/tests/ftest/daos_perf/small.yaml b/src/tests/ftest/daos_perf/small.yaml index e7a8cec274e..6c25b57f44c 100644 --- a/src/tests/ftest/daos_perf/small.yaml +++ b/src/tests/ftest/daos_perf/small.yaml @@ -1,17 +1,21 @@ hosts: test_servers: 2 test_clients: 2 + timeout: 540 + job_manager: class_name: Orterun mpi_type: openmpi manager_timeout: 480 + pool: size: 500GB control_method: dmg container: type: POSIX control_method: daos + server_config: name: daos_server engines_per_host: 2 @@ -19,25 +23,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + daos_perf: test_command: 'U;p F;p V O;p' test_type: daos diff --git a/src/tests/ftest/daos_racer/multi.yaml b/src/tests/ftest/daos_racer/multi.yaml index f013e664ca2..85b1fc983b9 100644 --- a/src/tests/ftest/daos_racer/multi.yaml +++ b/src/tests/ftest/daos_racer/multi.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 10800 + server_config: name: daos_server engines_per_host: 2 @@ -9,19 +11,16 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + daos_racer: runtime: 7200 clush_timeout: 10080 diff --git a/src/tests/ftest/daos_racer/parallel.yaml b/src/tests/ftest/daos_racer/parallel.yaml index 2c0d9f67847..9c79b82efb4 100644 --- a/src/tests/ftest/daos_racer/parallel.yaml +++ b/src/tests/ftest/daos_racer/parallel.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 4 test_clients: 4 + timeout: 1800 + server_config: name: daos_server engines_per_host: 2 @@ -9,23 +11,21 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: "ERR" storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: "ERR" storage: auto + job_manager: class_name: Orterun mpi_type: openmpi manager_timeout: 630 + daos_racer: runtime: 600 clush_timeout: 900 diff --git a/src/tests/ftest/daos_racer/simple.yaml b/src/tests/ftest/daos_racer/simple.yaml index 518a011f0db..6eda8bb011b 100644 --- a/src/tests/ftest/daos_racer/simple.yaml +++ b/src/tests/ftest/daos_racer/simple.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 1800 + server_config: name: daos_server engines_per_host: 2 @@ -9,19 +11,16 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: "ERR" storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: "ERR" storage: auto + daos_racer: runtime: 600 clush_timeout: 900 diff --git a/src/tests/ftest/daos_test/dfs.yaml b/src/tests/ftest/daos_test/dfs.yaml index 982611e9fc0..e27476b60bb 100644 --- a/src/tests/ftest/daos_test/dfs.yaml +++ b/src/tests/ftest/daos_test/dfs.yaml @@ -3,13 +3,14 @@ hosts: test_servers: 4 test_clients: 4 + timeout: 4000 + timeouts: test_daos_dfs_unit: 2030 test_daos_dfs_parallel: 2060 test_daos_dfs_sys: 90 -pool: - scm_size: 8G + server_config: name: daos_server engines_per_host: 2 @@ -18,8 +19,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log env_vars: - D_LOG_FILE_APPEND_PID=1 @@ -31,8 +30,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log env_vars: - D_LOG_FILE_APPEND_PID=1 @@ -43,12 +40,18 @@ server_config: scm_mount: /mnt/daos1 transport_config: allow_insecure: True + agent_config: transport_config: allow_insecure: True + dmg: transport_config: allow_insecure: True + +pool: + scm_size: 8G + daos_tests: test_name: test_daos_dfs_unit: DAOS_DFS_Unit diff --git a/src/tests/ftest/daos_test/nvme_recovery.yaml b/src/tests/ftest/daos_test/nvme_recovery.yaml index 66b6c3581d5..0788f0d5c23 100644 --- a/src/tests/ftest/daos_test/nvme_recovery.yaml +++ b/src/tests/ftest/daos_test/nvme_recovery.yaml @@ -2,13 +2,13 @@ # required quantity is indicated by the placeholders hosts: test_servers: 2 + timeout: 600 + # Remove this once DAOS-5134 is resolved setup: start_servers_once: false -pool: - scm_size: 8G - nvme_size: 16G + server_config: name: daos_server engines_per_host: 2 @@ -16,8 +16,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG env_vars: @@ -26,8 +24,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG env_vars: @@ -35,12 +31,19 @@ server_config: storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + +pool: + scm_size: 8G + nvme_size: 16G + daos_tests: num_clients: 1 test_name: diff --git a/src/tests/ftest/daos_test/rebuild.yaml b/src/tests/ftest/daos_test/rebuild.yaml index 9ceb3c02afb..d7795e82815 100644 --- a/src/tests/ftest/daos_test/rebuild.yaml +++ b/src/tests/ftest/daos_test/rebuild.yaml @@ -13,8 +13,6 @@ timeouts: test_rebuild_33: 200 test_rebuild_34: 200 test_rebuild_35: 180 -pool: - nvme_size: 0G server_config: name: daos_server @@ -23,8 +21,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -35,8 +31,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: @@ -55,6 +49,9 @@ dmg: transport_config: allow_insecure: false +pool: + nvme_size: 0G + daos_tests: num_clients: 1 num_replicas: 1 diff --git a/src/tests/ftest/daos_test/suite.yaml b/src/tests/ftest/daos_test/suite.yaml index d061771a248..4cdcccdb6af 100644 --- a/src/tests/ftest/daos_test/suite.yaml +++ b/src/tests/ftest/daos_test/suite.yaml @@ -2,6 +2,7 @@ # required quantity is indicated by the placeholders hosts: test_servers: 4 + # Note that subtests below can set their own timeout so this # should be a general average of all tests not including outliers # (I'm looking at you "rebuild tests") @@ -33,10 +34,7 @@ timeouts: test_daos_dedup: 220 test_daos_upgrade: 300 test_daos_pipeline: 60 -pool: - # This will create 8G of SCM and 16G of NVMe size of pool. - scm_size: 8G - nvme_size: 16G + server_config: name: daos_server engines_per_host: 2 @@ -44,8 +42,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -59,8 +55,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: @@ -74,12 +68,20 @@ server_config: transport_config: allow_insecure: true system_ram_reserved: 64 + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + +pool: + # This will create 8G of SCM and 16G of NVMe size of pool. + scm_size: 8G + nvme_size: 16G + daos_tests: num_clients: test_daos_degraded_mode: 1 diff --git a/src/tests/ftest/daos_vol/bigio.yaml b/src/tests/ftest/daos_vol/bigio.yaml index 3103218ff79..668e834b39d 100644 --- a/src/tests/ftest/daos_vol/bigio.yaml +++ b/src/tests/ftest/daos_vol/bigio.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 1 test_clients: 1 + timeout: 1000 + server_config: name: daos_server crt_timeout: 60 @@ -10,8 +12,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 4 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log env_vars: - D_LOG_FILE_APPEND_PID=1 @@ -21,19 +21,20 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 4 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log env_vars: - D_LOG_FILE_APPEND_PID=1 - FI_LOG_LEVEL=warn - D_LOG_STDERR_IN_LOG=1 storage: auto + pool: size: 50% + container: type: POSIX control_method: daos + daos_vol_tests: testname: h5_partest_t_bigio client_processes: 6 diff --git a/src/tests/ftest/datamover/large_dir.yaml b/src/tests/ftest/datamover/large_dir.yaml index ba36a88dd71..5b89483da9e 100644 --- a/src/tests/ftest/datamover/large_dir.yaml +++ b/src/tests/ftest/datamover/large_dir.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 420 + server_config: name: daos_server engines_per_host: 2 @@ -9,25 +11,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 95% control_method: dmg + container: type: POSIX control_method: daos + mdtest: client_ppn: dcp: 32 @@ -44,10 +45,12 @@ mdtest: depth: 4 branching_factor: 4 bytes: 4096 + dcp: bufsize: 4M chunksize: 128M client_processes: ppn: 32 + datamover: posix_root: "self.workdir" diff --git a/src/tests/ftest/datamover/large_file.yaml b/src/tests/ftest/datamover/large_file.yaml index 93ed5669b5c..72cad651a19 100644 --- a/src/tests/ftest/datamover/large_file.yaml +++ b/src/tests/ftest/datamover/large_file.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 420 + server_config: name: daos_server engines_per_host: 2 @@ -9,26 +11,25 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 95% svcn: 1 control_method: dmg + container: type: POSIX control_method: daos + ior: client_ppn: dcp: 20 @@ -41,10 +42,12 @@ ior: transfer_size: 4M block_size: '1G' # aggregate of 20G for dcp and 10G for fs_copy dfs_oclass: EC_4P2GX + dcp: bufsize: 4M chunksize: 128M client_processes: ppn: 32 + datamover: posix_root: "self.workdir" diff --git a/src/tests/ftest/datamover/obj_large_posix.yaml b/src/tests/ftest/datamover/obj_large_posix.yaml index 52b07b1557a..90028bc709f 100644 --- a/src/tests/ftest/datamover/obj_large_posix.yaml +++ b/src/tests/ftest/datamover/obj_large_posix.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 360 + server_config: name: daos_server engines_per_host: 2 @@ -9,25 +11,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 60G control_method: dmg + container: type: POSIX control_method: daos + mdtest: client_processes: np: 30 @@ -42,6 +43,7 @@ mdtest: depth: 2 branching_factor: 2 bytes: 4096 + dcp: client_processes: np: 30 diff --git a/src/tests/ftest/datamover/serial_large_posix.yaml b/src/tests/ftest/datamover/serial_large_posix.yaml index dc6f0ef3e4f..c4430d412ad 100644 --- a/src/tests/ftest/datamover/serial_large_posix.yaml +++ b/src/tests/ftest/datamover/serial_large_posix.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 480 + server_config: name: daos_server engines_per_host: 2 @@ -9,24 +11,23 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 60G + container: type: POSIX control_method: daos + mdtest: client_processes: np: 30 @@ -41,11 +42,14 @@ mdtest: depth: 2 branching_factor: 2 bytes: 4096 + dserialize: client_processes: np: 16 + ddeserialize: client_processes: np: 16 + dfuse: disable_caching: true diff --git a/src/tests/ftest/deployment/agent_failure.yaml b/src/tests/ftest/deployment/agent_failure.yaml index 83b1271281a..81d3c9ff9ad 100644 --- a/src/tests/ftest/deployment/agent_failure.yaml +++ b/src/tests/ftest/deployment/agent_failure.yaml @@ -17,15 +17,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/deployment/basic_checkout.yaml b/src/tests/ftest/deployment/basic_checkout.yaml index d0fa43eae2f..c0025237389 100644 --- a/src/tests/ftest/deployment/basic_checkout.yaml +++ b/src/tests/ftest/deployment/basic_checkout.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 2700 + server_config: name: daos_server engines_per_host: 2 @@ -9,21 +11,19 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: size: 50% control_method: dmg properties: ec_cell_sz:128KiB + container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on @@ -39,18 +39,21 @@ ior_easy: &ior_easy_base sw_deadline: 30 sw_wearout: 1 sw_status_file: stoneWallingStatusFile + ior_dfs_sx: <<: *ior_easy_base api: DFS dfs_oclass: SX dfs_chunk: 1MiB transfer_size: 1MiB + ior_dfs_ec_8p2gx: <<: *ior_easy_base api: DFS dfs_oclass: EC_8P2GX dfs_chunk: 8MiB transfer_size: 8MiB + ior_dfs_ec_16p2gx: <<: *ior_easy_base api: DFS @@ -72,16 +75,19 @@ mdtest_easy: &mdtest_easy_base stonewall_timer: 30 stonewall_statusfile: stoneWallingStatusFile dfs_destroy: false + mdtest_dfs_s1: <<: *mdtest_easy_base dfs_oclass: S1 dfs_dir_oclass: SX dfs_chunk: 1MiB + mdtest_dfs_ec_8p2g1: <<: *mdtest_easy_base dfs_oclass: EC_8P2G1 dfs_dir_oclass: RP_3GX dfs_chunk: 8MiB + mdtest_dfs_ec_16p2g1: <<: *mdtest_easy_base dfs_oclass: EC_16P2G1 @@ -157,7 +163,9 @@ mdtest: - [POSIX, 4096, 4096, 2, 10, 5, ' '] - [DFS, 4096, 4096, 1, 25, 20, '-u'] - [POSIX, 0, 0, 2, 10, 5, '-u -C -T -r'] + dfuse: disable_caching: true + hdf5_vol: plugin_path: /usr/lib64/mpich/lib diff --git a/src/tests/ftest/deployment/critical_integration.yaml b/src/tests/ftest/deployment/critical_integration.yaml index 764c564eba0..212d121a6e8 100644 --- a/src/tests/ftest/deployment/critical_integration.yaml +++ b/src/tests/ftest/deployment/critical_integration.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 300 + server_config: name: daos_server engines_per_host: 2 @@ -9,17 +11,14 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + check_remote_root_access: false # this is needed as on aurora cluster we use libfabric provided # by HPE, which does not reside in regular location. diff --git a/src/tests/ftest/deployment/disk_failure.yaml b/src/tests/ftest/deployment/disk_failure.yaml index dd764f0d59c..e0e9be26f58 100644 --- a/src/tests/ftest/deployment/disk_failure.yaml +++ b/src/tests/ftest/deployment/disk_failure.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 900 + daos_server: pattern_timeout: 60 + server_config: name: daos_server engines_per_host: 2 @@ -11,28 +14,27 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto targets: 16 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto targets: 16 + pool: size: 80% control_method: dmg svcn: 3 + container: type: POSIX control_method: daos oclass: RP_2GX properties: "cksum:crc16,rf:1" + ior: client_processes: np: 2 diff --git a/src/tests/ftest/deployment/io_sys_admin.yaml b/src/tests/ftest/deployment/io_sys_admin.yaml index f2a238ad4b5..940a38b0f43 100644 --- a/src/tests/ftest/deployment/io_sys_admin.yaml +++ b/src/tests/ftest/deployment/io_sys_admin.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 700 + server_config: name: daos_server engines_per_host: 2 @@ -9,37 +11,40 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + dmg: dmg_sub_command: storage storage: storage_sub_command: scan + pool_1: scm_size: 256MiB nvme_size: 16GiB + pool_2: scm_size: 10GiB nvme_size: 50GiB + pool_3: size: 90% + container_1: properties: cksum:crc16,cksum_size:16384,srv_cksum:on control_method: daos + container_2: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on control_method: daos oclass: RP_2GX + container_3: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on @@ -48,6 +53,7 @@ container_3: pool: size: 40% + container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on @@ -72,6 +78,7 @@ largefilecount: mdtest_oclass: # Run once with S1 and then with EC_16P2G1 - S1 - EC_2P1G1 + ior: client_processes: ppn: 30 @@ -82,6 +89,7 @@ ior: signature: 123 transfer_size: '1Mib' block_size: '1Mib' + dfuse: disable_caching: True @@ -97,11 +105,13 @@ mdtest: write_bytes: 4096 read_bytes: 4096 depth: 0 + dcp: bufsize: "64MB" chunksize: "128MB" client_processes: np: 16 + hdf5_vol: plugin_path: /usr/lib64/mpich/lib diff --git a/src/tests/ftest/deployment/ior_per_rank.yaml b/src/tests/ftest/deployment/ior_per_rank.yaml index 3475c594484..03918af29d0 100644 --- a/src/tests/ftest/deployment/ior_per_rank.yaml +++ b/src/tests/ftest/deployment/ior_per_rank.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 2 + timeout: 1500 + server_config: name: daos_server engines_per_host: 2 @@ -9,26 +11,25 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: mode: 146 size: 350G # Cannot use percentage, as it does not work when using pool create for per rank. properties: ec_cell_sz:128KiB + container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on control_method: daos oclass: SX + ior: client_processes: ppn: 32 diff --git a/src/tests/ftest/deployment/network_failure.yaml b/src/tests/ftest/deployment/network_failure.yaml index 8fb434dc30f..145578527e8 100644 --- a/src/tests/ftest/deployment/network_failure.yaml +++ b/src/tests/ftest/deployment/network_failure.yaml @@ -13,16 +13,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log targets: 8 storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log targets: 8 storage: auto diff --git a/src/tests/ftest/deployment/server_rank_failure.yaml b/src/tests/ftest/deployment/server_rank_failure.yaml index 5f1b465a2a4..efcf9ae4540 100644 --- a/src/tests/ftest/deployment/server_rank_failure.yaml +++ b/src/tests/ftest/deployment/server_rank_failure.yaml @@ -14,8 +14,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: INFO storage: auto @@ -25,8 +23,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: INFO storage: auto diff --git a/src/tests/ftest/deployment/target_failure.yaml b/src/tests/ftest/deployment/target_failure.yaml index 0323c906ce8..0ef08f0352e 100644 --- a/src/tests/ftest/deployment/target_failure.yaml +++ b/src/tests/ftest/deployment/target_failure.yaml @@ -11,15 +11,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/dfuse/fio_pil4dfs_small.yaml b/src/tests/ftest/dfuse/fio_pil4dfs_small.yaml index 66491601a06..7269a12acff 100644 --- a/src/tests/ftest/dfuse/fio_pil4dfs_small.yaml +++ b/src/tests/ftest/dfuse/fio_pil4dfs_small.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 1000 + server_config: name: daos_server engines_per_host: 2 @@ -9,28 +11,28 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + pool: scm_size: 1600000000 nvme_size: 20000000000 + container: type: POSIX control_method: daos @@ -41,6 +43,7 @@ container: properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 rf2: properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 + fio: names: - global @@ -70,6 +73,7 @@ fio: rw: 'randrw' test: numjobs: 1 + dfuse: mount_dir: "/tmp/daos_dfuse" thread_count: 8 diff --git a/src/tests/ftest/dfuse/fio_small.yaml b/src/tests/ftest/dfuse/fio_small.yaml index a153b2dc8f5..92722de6d0f 100644 --- a/src/tests/ftest/dfuse/fio_small.yaml +++ b/src/tests/ftest/dfuse/fio_small.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 1000 + server_config: name: daos_server engines_per_host: 2 @@ -9,29 +11,29 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + pool: scm_size: 1600000000 nvme_size: 20000000000 control_method: dmg + container: type: POSIX control_method: daos @@ -42,6 +44,7 @@ container: properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 rf2: properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 + fio: names: - global @@ -71,6 +74,7 @@ fio: rw: 'randrw' test: numjobs: 1 + dfuse: mount_dir: "/tmp/daos_dfuse" thread_count: 8 diff --git a/src/tests/ftest/dfuse/pil4dfs_dcache.yaml b/src/tests/ftest/dfuse/pil4dfs_dcache.yaml index 719451ba5ba..34b301878c6 100644 --- a/src/tests/ftest/dfuse/pil4dfs_dcache.yaml +++ b/src/tests/ftest/dfuse/pil4dfs_dcache.yaml @@ -10,14 +10,10 @@ server_config: engines: 0: pinned_numa_node: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/dfuse/pil4dfs_fio.yaml b/src/tests/ftest/dfuse/pil4dfs_fio.yaml index 5d7ef22e4ec..a6d9fd4ca08 100644 --- a/src/tests/ftest/dfuse/pil4dfs_fio.yaml +++ b/src/tests/ftest/dfuse/pil4dfs_fio.yaml @@ -10,14 +10,10 @@ server_config: engines: 0: pinned_numa_node: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/erasurecode/aggregation.yaml b/src/tests/ftest/erasurecode/aggregation.yaml index 579c015d82c..850c6905773 100644 --- a/src/tests/ftest/erasurecode/aggregation.yaml +++ b/src/tests/ftest/erasurecode/aggregation.yaml @@ -1,10 +1,13 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 2500 + setup: start_agents_once: false start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,26 +15,25 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 90% control_method: dmg pool_query_timeout: 30 + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/cell_size.yaml b/src/tests/ftest/erasurecode/cell_size.yaml index b26df10b2d3..604bde7131f 100644 --- a/src/tests/ftest/erasurecode/cell_size.yaml +++ b/src/tests/ftest/erasurecode/cell_size.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 1600 + server_config: name: daos_server engines_per_host: 2 @@ -9,19 +11,16 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: control_method: dmg size: 93% @@ -30,9 +29,11 @@ pool: - 64KiB - 128KiB - 1MiB + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/cell_size_property.yaml b/src/tests/ftest/erasurecode/cell_size_property.yaml index 128b5aa7133..4d3c83d1733 100644 --- a/src/tests/ftest/erasurecode/cell_size_property.yaml +++ b/src/tests/ftest/erasurecode/cell_size_property.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 900 + server_config: name: daos_server engines_per_host: 2 @@ -10,19 +12,16 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: control_method: dmg size: 93% @@ -30,6 +29,7 @@ pool: - 4096 - 65536 - 131072 + container: type: POSIX control_method: daos @@ -38,6 +38,7 @@ container: - 65536 - 131072 - 1048576 + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/ior_smoke.yaml b/src/tests/ftest/erasurecode/ior_smoke.yaml index 20ebef761f8..114396c5428 100644 --- a/src/tests/ftest/erasurecode/ior_smoke.yaml +++ b/src/tests/ftest/erasurecode/ior_smoke.yaml @@ -1,10 +1,13 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 900 + setup: start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -13,25 +16,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: control_method: dmg size: 93% + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/mdtest_smoke.yaml b/src/tests/ftest/erasurecode/mdtest_smoke.yaml index 5535d8fea20..7aa1558ad84 100644 --- a/src/tests/ftest/erasurecode/mdtest_smoke.yaml +++ b/src/tests/ftest/erasurecode/mdtest_smoke.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 600 + server_config: name: daos_server engines_per_host: 2 @@ -10,25 +12,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: control_method: dmg size: 53% + container: type: POSIX control_method: daos + mdtest: client_processes: np_48: diff --git a/src/tests/ftest/erasurecode/multiple_rank_failure.yaml b/src/tests/ftest/erasurecode/multiple_rank_failure.yaml index cd0d2e77bb5..88806efa2f3 100644 --- a/src/tests/ftest/erasurecode/multiple_rank_failure.yaml +++ b/src/tests/ftest/erasurecode/multiple_rank_failure.yaml @@ -15,15 +15,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/erasurecode/multiple_target_failure.yaml b/src/tests/ftest/erasurecode/multiple_target_failure.yaml index cd0d2e77bb5..88806efa2f3 100644 --- a/src/tests/ftest/erasurecode/multiple_target_failure.yaml +++ b/src/tests/ftest/erasurecode/multiple_target_failure.yaml @@ -15,15 +15,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/erasurecode/offline_rebuild.yaml b/src/tests/ftest/erasurecode/offline_rebuild.yaml index d583887c24f..b84689f101b 100644 --- a/src/tests/ftest/erasurecode/offline_rebuild.yaml +++ b/src/tests/ftest/erasurecode/offline_rebuild.yaml @@ -7,11 +7,14 @@ hosts: 12_server: test_servers: server-[1-6] test_clients: 2 + timeout: 1200 + setup: # Test variants use different server counts, so ensure servers are stopped after each run start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -20,22 +23,21 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log storage: auto + pool: size: 93% + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml b/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml index 083553e1856..ee7f74877e3 100644 --- a/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml +++ b/src/tests/ftest/erasurecode/offline_rebuild_aggregation.yaml @@ -1,10 +1,13 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 6000 + setup: start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -12,24 +15,23 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log storage: auto + pool: size: 90% control_method: dmg pool_query_timeout: 30 + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/offline_rebuild_single.yaml b/src/tests/ftest/erasurecode/offline_rebuild_single.yaml index 8b7fba9ae09..70024907c16 100644 --- a/src/tests/ftest/erasurecode/offline_rebuild_single.yaml +++ b/src/tests/ftest/erasurecode/offline_rebuild_single.yaml @@ -7,9 +7,12 @@ hosts: 12_server: test_servers: server-[1-6] test_clients: 1 + setup: start_servers_once: False + timeout: 900 + server_config: name: daos_server engines_per_host: 2 @@ -17,26 +20,25 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log storage: auto + pool: size: 93% pool_query_timeout: 30 + container: type: POSIX control_method: API single_data_set: # [object_qty, record_qty, dkey, akey, data_size] - [1, 1, 1, 1, 4194304] + objectclass: dfs_oclass_list: #- [EC_Object_Class, Minimum number of servers] diff --git a/src/tests/ftest/erasurecode/online_rebuild.yaml b/src/tests/ftest/erasurecode/online_rebuild.yaml index f062ef9fb6d..6a324e608bd 100644 --- a/src/tests/ftest/erasurecode/online_rebuild.yaml +++ b/src/tests/ftest/erasurecode/online_rebuild.yaml @@ -7,10 +7,13 @@ hosts: 12_server: test_servers: server-[1-6] test_clients: 2 + timeout: 1000 + setup: start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -18,27 +21,27 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log storage: auto + pool: size: 93% + container: type: POSIX control_method: daos + daos: container: destroy: env_vars: - CRT_TIMEOUT=10 + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml b/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml index de917248dfb..e8ebd43d811 100644 --- a/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml +++ b/src/tests/ftest/erasurecode/online_rebuild_mdtest.yaml @@ -7,10 +7,13 @@ hosts: 12_server: test_servers: server-[1-6] test_clients: 2 + timeout: 1500 + setup: start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -18,8 +21,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: ERR storage: auto @@ -29,23 +30,25 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log log_mask: ERR storage: auto env_vars: - NA_OFI_UNEXPECTED_TAG_MSG=0 + client: env_vars: - NA_OFI_UNEXPECTED_TAG_MSG=0 + pool: control_method: dmg size: 93% + container: type: POSIX control_method: daos properties: rd_fac:2 + mdtest: client_processes: np: 4 diff --git a/src/tests/ftest/erasurecode/online_rebuild_single.yaml b/src/tests/ftest/erasurecode/online_rebuild_single.yaml index 7284a1f7134..b5879f093e5 100644 --- a/src/tests/ftest/erasurecode/online_rebuild_single.yaml +++ b/src/tests/ftest/erasurecode/online_rebuild_single.yaml @@ -7,9 +7,12 @@ hosts: 12_server: test_servers: server-[1-6] test_clients: 1 + timeout: 1200 + setup: start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -17,27 +20,26 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log storage: auto + pool: size: 93% pool_query_timeout: 30 properties: rd_fac:2 + container: type: POSIX control_method: API single_data_set: # [object_qty, record_qty, dkey, akey, data_size] - [1, 1, 1, 1, 4194304] + objectclass: dfs_oclass_list: #- [EC_Object_Class, Minimum number of servers] diff --git a/src/tests/ftest/erasurecode/rank_failure.yaml b/src/tests/ftest/erasurecode/rank_failure.yaml index c202d6805fd..3dba5b0b34b 100644 --- a/src/tests/ftest/erasurecode/rank_failure.yaml +++ b/src/tests/ftest/erasurecode/rank_failure.yaml @@ -1,10 +1,13 @@ hosts: test_servers: 6 test_clients: 1 + timeout: 1800 + setup: start_agents_once: false start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,22 +15,20 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: scm_size: 8G control_method: dmg + gen_io_conf: ranks: "11" targets: "4" diff --git a/src/tests/ftest/erasurecode/rebuild_disabled.yaml b/src/tests/ftest/erasurecode/rebuild_disabled.yaml index e970e043972..3cf796c63bf 100644 --- a/src/tests/ftest/erasurecode/rebuild_disabled.yaml +++ b/src/tests/ftest/erasurecode/rebuild_disabled.yaml @@ -7,11 +7,14 @@ hosts: 10_server: test_servers: server-[1-5] test_clients: 3 + timeout: 3500 + setup: # Test variants use different server counts, so ensure servers are stopped after each run start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -19,23 +22,22 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log storage: auto + pool: size: 93% pool_query_timeout: 30 + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml b/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml index 006e75079fb..a91040c59e8 100644 --- a/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml +++ b/src/tests/ftest/erasurecode/rebuild_disabled_single.yaml @@ -7,11 +7,14 @@ hosts: 10_server: test_servers: server-[1-5] test_clients: 1 + timeout: 400 + setup: # Test variants use different server counts, so ensure servers are stopped after each run start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -20,26 +23,25 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log storage: auto + pool: size: 93% pool_query_timeout: 30 + container: type: POSIX control_method: daos single_data_set: # [object_qty, record_qty, dkey, akey, data_size] - [1, 1, 1, 1, 4194304] + objectclass: dfs_oclass_list: #- [EC_Object_Class, Minimum number of servers] diff --git a/src/tests/ftest/erasurecode/rebuild_fio.yaml b/src/tests/ftest/erasurecode/rebuild_fio.yaml index 6ec1a98faff..677e4f9a961 100644 --- a/src/tests/ftest/erasurecode/rebuild_fio.yaml +++ b/src/tests/ftest/erasurecode/rebuild_fio.yaml @@ -7,10 +7,13 @@ hosts: 12_server: test_servers: server-[1-6] test_clients: 1 + timeout: 1500 + setup: start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -18,8 +21,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: ERR targets: 2 @@ -27,16 +28,16 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log log_mask: ERR targets: 2 storage: auto + pool: size: 60% aggregation_timeout: 180 set_logmasks: False + container: type: POSIX control_method: daos @@ -45,6 +46,7 @@ container: properties: rd_fac:1 rf2: properties: rd_fac:2 + fio: names: - test @@ -64,6 +66,7 @@ fio: randrw: rw: 'randrw' rw_read: 'randrw' + dfuse: mount_dir: "/tmp/daos_dfuse" disable_caching: True diff --git a/src/tests/ftest/erasurecode/restart.yaml b/src/tests/ftest/erasurecode/restart.yaml index 1a1e967dde0..08d6a3dae19 100644 --- a/src/tests/ftest/erasurecode/restart.yaml +++ b/src/tests/ftest/erasurecode/restart.yaml @@ -1,10 +1,13 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 1500 + setup: start_agents_once: False start_servers_once: False + server_config: name: daos_server engines_per_host: 2 @@ -12,27 +15,26 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 40% svcn: 3 control_method: dmg pool_query_timeout: 30 + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: @@ -54,5 +56,6 @@ ior: - ["EC_4P1GX", 6] - ["EC_4P2GX", 6] - ["EC_8P2GX", 10] + aggregation: threshold: "70%" diff --git a/src/tests/ftest/erasurecode/space_usage.yaml b/src/tests/ftest/erasurecode/space_usage.yaml index dc33af3aaec..e0ff34387eb 100644 --- a/src/tests/ftest/erasurecode/space_usage.yaml +++ b/src/tests/ftest/erasurecode/space_usage.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 600 + server_config: name: daos_server engines_per_host: 2 @@ -9,25 +11,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 95% properties: ec_cell_sz:128KiB,reclaim:disabled + container: type: POSIX control_method: daos + ior: &ior_base client_processes: ppn: 32 @@ -36,11 +37,14 @@ ior: &ior_base transfer_size: 32KiB # Partial update block_size: 16GiB # Aggregate 500 GiB flags: "-w -C -e -g -G 27 -k -Q 1 -v" + ior_ec_4p2gx: <<: *ior_base dfs_oclass: EC_4P2GX + ior_ec_4p1gx: <<: *ior_base dfs_oclass: EC_4P1GX + space_usage: max_diff_percent: 0.05 diff --git a/src/tests/ftest/erasurecode/truncate.yaml b/src/tests/ftest/erasurecode/truncate.yaml index 65cf5fde3ed..0962a9d38d3 100644 --- a/src/tests/ftest/erasurecode/truncate.yaml +++ b/src/tests/ftest/erasurecode/truncate.yaml @@ -7,10 +7,13 @@ hosts: 10_server: test_servers: server-[1-5] test_clients: 1 + timeout: 300 + setup: start_agents_once: false start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -18,22 +21,20 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 50% control_method: dmg + container: type: POSIX control_method: daos @@ -42,6 +43,7 @@ container: properties: rd_fac:1 rf2: properties: rd_fac:2 + fio: names: - test @@ -55,6 +57,7 @@ fio: read_write: rw: 'write' truncate_size: '26214400' # 25Mb + dfuse: mount_dir: "/tmp/daos_dfuse" caching: !mux diff --git a/src/tests/ftest/fault_injection/ec.yaml b/src/tests/ftest/fault_injection/ec.yaml index 7f5e987c216..8e6fed329cb 100644 --- a/src/tests/ftest/fault_injection/ec.yaml +++ b/src/tests/ftest/fault_injection/ec.yaml @@ -1,10 +1,13 @@ hosts: test_servers: 7 test_clients: 1 + timeout: 300 + setup: start_agents_once: false start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,25 +15,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: control_method: dmg size: 93% properties: ec_cell_sz:64KiB + container: type: POSIX control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 + ior: api: "DFS" client_processes: @@ -47,6 +49,7 @@ ior: - "EC_2P2GX" - "EC_4P2GX" - "EC_8P2GX" + fio: names: - global @@ -63,8 +66,10 @@ fio: rw: 'rw' test: numjobs: 1 + dfuse: mount_dir: "/tmp/daos_dfuse" + faults: fault_list: - DAOS_CSUM_CORRUPT_FETCH diff --git a/src/tests/ftest/fault_injection/pool.yaml b/src/tests/ftest/fault_injection/pool.yaml index e1ff2e46393..5afb4455857 100644 --- a/src/tests/ftest/fault_injection/pool.yaml +++ b/src/tests/ftest/fault_injection/pool.yaml @@ -10,8 +10,6 @@ server_config: pinned_numa_node: 0 targets: 4 nr_xs_helpers: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: 0: @@ -21,8 +19,6 @@ server_config: pinned_numa_node: 1 targets: 4 nr_xs_helpers: 0 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: 0: diff --git a/src/tests/ftest/io/io_consistency.yaml b/src/tests/ftest/io/io_consistency.yaml index d2fa53d73d2..43b783bacb2 100644 --- a/src/tests/ftest/io/io_consistency.yaml +++ b/src/tests/ftest/io/io_consistency.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 2 + timeout: 210 + server_config: name: daos_server engines_per_host: 2 @@ -9,25 +11,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: scm_size: 5000000000 nvme_size: 20000000000 + container: type: POSIX control_method: daos + ior: client_processes: np: 10 @@ -51,5 +52,6 @@ ior: objectclass: SX: dfs_oclass: "SX" + dfuse: disable_caching: true diff --git a/src/tests/ftest/io/large_file_count.yaml b/src/tests/ftest/io/large_file_count.yaml index 6ff375cf3a9..3c7fe6499e0 100644 --- a/src/tests/ftest/io/large_file_count.yaml +++ b/src/tests/ftest/io/large_file_count.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 5000 + server_config: name: daos_server engines_per_host: 2 @@ -9,22 +11,21 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: size: 95% + container: type: POSIX control_method: daos + largefilecount: api: - DFS @@ -36,6 +37,7 @@ largefilecount: mdtest_oclass: # Run once with S1 and then with EC_16P2G1 - S1 - EC_2P1G1 + ior: np: 30 dfs_destroy: false @@ -46,6 +48,7 @@ ior: block_size: '7G' env_vars: - D_IL_REPORT=1 + dfuse: disable_caching: true diff --git a/src/tests/ftest/io/macsio_test.yaml b/src/tests/ftest/io/macsio_test.yaml index 663e4efc67c..ea3f5605577 100644 --- a/src/tests/ftest/io/macsio_test.yaml +++ b/src/tests/ftest/io/macsio_test.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 1 test_clients: 3 + timeout: 120 + server_config: name: daos_server engines_per_host: 2 @@ -9,23 +11,22 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: scm_size: 5G nvme_size: 10G + container: control_method: daos type: POSIX + macsio: interface: hdf5 parallel_file_mode: SIF 1 @@ -36,6 +37,7 @@ macsio: num_dumps: 2 debug_level: 1 processes: 6 + job_manager: !mux mpich: class_name: Mpirun diff --git a/src/tests/ftest/io/seg_count.yaml b/src/tests/ftest/io/seg_count.yaml index 4b4e2942ab4..64b8a9d15ae 100644 --- a/src/tests/ftest/io/seg_count.yaml +++ b/src/tests/ftest/io/seg_count.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 4 test_clients: 4 + timeout: 2000 + server_config: name: daos_server engines_per_host: 2 @@ -9,23 +11,22 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: size: 95% control_method: dmg + container: type: POSIX control_method: daos + ior: client_processes: !mux slots_16: diff --git a/src/tests/ftest/io/small_file_count.yaml b/src/tests/ftest/io/small_file_count.yaml index 79e02c3d787..2a33a3ef934 100644 --- a/src/tests/ftest/io/small_file_count.yaml +++ b/src/tests/ftest/io/small_file_count.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 750 + server_config: name: daos_server engines_per_host: 2 @@ -9,23 +11,22 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: scm_size: 40G nvme_size: 300G + container: type: POSIX control_method: daos + largefilecount: api: - DFS @@ -37,6 +38,7 @@ largefilecount: mdtest_oclass: # Run once with S1 and then with EC_16P2G1 - S1 - EC_2P1G1 + ior: np: 30 dfs_destroy: false @@ -47,6 +49,7 @@ ior: block_size: '2G' env_vars: - D_IL_REPORT=1 + dfuse: disable_caching: true diff --git a/src/tests/ftest/io/unaligned_io.yaml b/src/tests/ftest/io/unaligned_io.yaml index bf1a6c19a85..3bcc450c8c5 100644 --- a/src/tests/ftest/io/unaligned_io.yaml +++ b/src/tests/ftest/io/unaligned_io.yaml @@ -1,6 +1,8 @@ hosts: test_servers: 4 + timeout: 900 + server_config: name: daos_server engines_per_host: 2 @@ -9,8 +11,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -25,8 +25,6 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: @@ -37,8 +35,10 @@ server_config: - D_LOG_FILE_APPEND_PID=1 - COVFILE=/tmp/test.cov storage: auto + pool: scm_size: 12G + datasize: sizes: - 20 diff --git a/src/tests/ftest/ior/crash.yaml b/src/tests/ftest/ior/crash.yaml index 294599db43e..2e14578d654 100644 --- a/src/tests/ftest/ior/crash.yaml +++ b/src/tests/ftest/ior/crash.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 1 test_clients: 3 + timeout: 800 + server_config: name: daos_server engines_per_host: 2 @@ -9,25 +11,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 90% control_method: dmg + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/ior/hard.yaml b/src/tests/ftest/ior/hard.yaml index 089f3e56214..1bf74aec42e 100644 --- a/src/tests/ftest/ior/hard.yaml +++ b/src/tests/ftest/ior/hard.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 5 test_clients: 3 + timeout: 1000 + server_config: name: daos_server engines_per_host: 2 @@ -9,8 +11,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: @@ -21,8 +21,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: @@ -30,13 +28,16 @@ server_config: class: dcpm scm_list: ["/dev/pmem1"] scm_mount: /mnt/daos1 + pool: scm_size: 500G control_method: dmg + container: type: POSIX control_method: daos properties: dedup:memcmp + ior: client_processes: np: 48 diff --git a/src/tests/ftest/ior/hard_rebuild.yaml b/src/tests/ftest/ior/hard_rebuild.yaml index 54a89fc237f..32665ab18ad 100644 --- a/src/tests/ftest/ior/hard_rebuild.yaml +++ b/src/tests/ftest/ior/hard_rebuild.yaml @@ -7,10 +7,13 @@ hosts: 12_server: test_servers: server-[1-6] test_clients: 2 + timeout: 1000 + setup: start_agents_once: false start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -18,24 +21,23 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto + pool: size: 90% + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/ior/intercept_multi_client.yaml b/src/tests/ftest/ior/intercept_multi_client.yaml index aaf6987dabe..a297a696619 100644 --- a/src/tests/ftest/ior/intercept_multi_client.yaml +++ b/src/tests/ftest/ior/intercept_multi_client.yaml @@ -11,16 +11,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: WARN storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: WARN storage: auto diff --git a/src/tests/ftest/ior/small.yaml b/src/tests/ftest/ior/small.yaml index 4827e0d99cd..c369408f423 100644 --- a/src/tests/ftest/ior/small.yaml +++ b/src/tests/ftest/ior/small.yaml @@ -10,15 +10,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto transport_config: diff --git a/src/tests/ftest/mdtest/small.yaml b/src/tests/ftest/mdtest/small.yaml index 94c5c93c8a7..db92ce07f65 100644 --- a/src/tests/ftest/mdtest/small.yaml +++ b/src/tests/ftest/mdtest/small.yaml @@ -10,15 +10,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto transport_config: diff --git a/src/tests/ftest/nvme/enospace.yaml b/src/tests/ftest/nvme/enospace.yaml index 8b276cf7e8e..9b3b3bb46bb 100644 --- a/src/tests/ftest/nvme/enospace.yaml +++ b/src/tests/ftest/nvme/enospace.yaml @@ -1,9 +1,11 @@ hosts: test_servers: 2 test_clients: 2 + # Few tests are in loop for ~10 times and single loop # is taking ~600 seconds to finish so larger timeout to run tests. timeout: 7500 + server_config: name: daos_server engines_per_host: 2 @@ -11,25 +13,24 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 targets: 1 storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 targets: 1 storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + pool: scm_size: 5G nvme_size: 5G @@ -42,6 +43,7 @@ container: control_method: daos register_cleanup: False # Skip teardown destroy. Test manually destroys containers. type: POSIX + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/nvme/fragmentation.yaml b/src/tests/ftest/nvme/fragmentation.yaml index bceb12f20db..551f0c44ca6 100644 --- a/src/tests/ftest/nvme/fragmentation.yaml +++ b/src/tests/ftest/nvme/fragmentation.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 2 + timeout: 6000 + server_config: name: daos_server engines_per_host: 2 @@ -9,23 +11,22 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: size: 95% control_method: dmg + container: type: POSIX control_method: daos + ior: num_repeat: 30 num_parallel_job: 10 diff --git a/src/tests/ftest/nvme/health.yaml b/src/tests/ftest/nvme/health.yaml index 581b14f0269..889867f12be 100644 --- a/src/tests/ftest/nvme/health.yaml +++ b/src/tests/ftest/nvme/health.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 900 + server_config: name: daos_server engines_per_host: 2 @@ -10,26 +12,25 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto transport_config: allow_insecure: True + agent_config: transport_config: allow_insecure: True + dmg: transport_config: allow_insecure: True + pool: control_method: dmg max_num_pools: 40 diff --git a/src/tests/ftest/nvme/io_verification.yaml b/src/tests/ftest/nvme/io_verification.yaml index a183f319cd2..48fbb787825 100644 --- a/src/tests/ftest/nvme/io_verification.yaml +++ b/src/tests/ftest/nvme/io_verification.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 4000 + server_config: name: daos_server engines_per_host: 2 @@ -9,30 +11,33 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: num_pools: 4 + pool_0: size: 20% + pool_1: size: 30% + pool_2: size: 50% + pool_3: size: 60% + container: type: POSIX control_method: daos + ior: client_processes: np: 16 diff --git a/src/tests/ftest/nvme/object.yaml b/src/tests/ftest/nvme/object.yaml index 9df02748652..6fdac0a0a41 100644 --- a/src/tests/ftest/nvme/object.yaml +++ b/src/tests/ftest/nvme/object.yaml @@ -1,9 +1,11 @@ hosts: test_servers: 3 test_clients: 1 + timeouts: test_nvme_object_single_pool: 270 test_nvme_object_multiple_pools: 16000 + server_config: name: daos_server engines_per_host: 2 @@ -11,26 +13,26 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool_1: scm_size: 4GB nvme_size: 20G + pool_2: scm_size: 4GB nvme_size: 100GB + pool_3: scm_size: 4GB nvme_size: 350GB + container: object_qty: 10 record_size: diff --git a/src/tests/ftest/nvme/pool_exclude.yaml b/src/tests/ftest/nvme/pool_exclude.yaml index 26bf9014c0f..3d157bffce1 100644 --- a/src/tests/ftest/nvme/pool_exclude.yaml +++ b/src/tests/ftest/nvme/pool_exclude.yaml @@ -1,13 +1,16 @@ hosts: test_servers: 5 test_clients: 3 + # If we define the server under test_servers, launch.py will convert it to the # actual server name passed into --test_servers. If above test_servers is hosts, # it'll be used as one of the servers at test startup time, so use something # other than hosts. timeout: 1000 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -15,19 +18,16 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: ERR storage: auto + pool: scm_size: 50000000000 nvme_size: 300000000000 @@ -35,10 +35,12 @@ pool: control_method: dmg rebuild_timeout: 180 pool_query_timeout: 30 + container: type: POSIX control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:2 + ior_flags_common: &ior_flags_common write_flags: "-w -F -k -G 1" read_flags: "-F -r -R -k -G 1" @@ -50,6 +52,7 @@ ior_flags_common: &ior_flags_common - ["NA", "NA", 4000, 50000000] # [4K, 51M] - ["NA", "NA", 1000000, 500000000] # [1M, 512M] - ["NA", "NA", 1000000000, 8000000000] # [1G, 8G] + ior: client_processes: np: 48 @@ -69,11 +72,15 @@ ior: <<: *ior_flags_common dfs_oclass: EC_8P2GX dfs_dir_oclass: EC_8P2GX + loop_test: iterations: 2 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false diff --git a/src/tests/ftest/nvme/pool_extend.yaml b/src/tests/ftest/nvme/pool_extend.yaml index db938ba7b93..0954c74029f 100644 --- a/src/tests/ftest/nvme/pool_extend.yaml +++ b/src/tests/ftest/nvme/pool_extend.yaml @@ -1,15 +1,19 @@ hosts: test_servers: server-[1-2] test_clients: 2 + # If we define the server under test_servers, launch.py will convert it to the # actual server name passed into --test_servers. If above test_servers is hosts, # it'll be used as one of the servers at test startup time, so use something # other than hosts. extra_servers: test_servers: server-[3-5] + timeout: 1000 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -17,32 +21,34 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log storage: auto + pool: svcn: 4 control_method: dmg rebuild_timeout: 120 pool_query_timeout: 30 + pool_qty_1: size: "50%" + pool_qty_2: size: "25%" + pool_qty_3: size: "16%" + container: type: POSIX control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 + ior_flags_common: &ior_flags_common write_flags: "-w -F -k -G 1" read_flags: "-F -r -R -k -G 1" @@ -54,6 +60,7 @@ ior_flags_common: &ior_flags_common - ["NA", "NA", 4000, 5000000] # [4K, 5.1M] - ["NA", "NA", 1000000, 500000000] # [1M, 512M] - ["NA", "NA", 1000000000, 8000000000] # [1G, 8G] + ior: client_processes: np: 48 @@ -69,11 +76,15 @@ ior: <<: *ior_flags_common dfs_oclass: EC_2P1GX dfs_dir_oclass: EC_2P1GX + loop_test: iterations: 3 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false diff --git a/src/tests/ftest/osa/dmg_negative_test.yaml b/src/tests/ftest/osa/dmg_negative_test.yaml index 36d0a2e3de5..a3a0539038c 100644 --- a/src/tests/ftest/osa/dmg_negative_test.yaml +++ b/src/tests/ftest/osa/dmg_negative_test.yaml @@ -1,14 +1,18 @@ hosts: test_servers: server-[1-2] test_clients: 1 + # If we define the server under test_servers, launch.py will convert it to the # actual server name passed into --test_servers. If above test_servers is hosts, # it'll be used as one of the servers at test startup time, so use something # other than hosts. extra_servers: test_servers: server-3 + timeout: 1800 + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -16,8 +20,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -26,21 +28,22 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 6000000000 nvme_size: 54000000000 svcn: 4 control_method: dmg + container: properties: enable_checksum: true + test_sequence: dmg_cmd_test: # Rank list, target_list, Pass/Fail Condition diff --git a/src/tests/ftest/osa/offline_drain.yaml b/src/tests/ftest/osa/offline_drain.yaml index a8776edd4a4..11aa4ee11c1 100644 --- a/src/tests/ftest/osa/offline_drain.yaml +++ b/src/tests/ftest/osa/offline_drain.yaml @@ -1,10 +1,14 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 2400 + setup: start_servers_once: false + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +16,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: INFO,MEM=ERR env_vars: @@ -22,36 +24,40 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: INFO,MEM=ERR env_vars: - DD_MASK=mgmt,md storage: auto + pool: scm_size: 12000000000 nvme_size: 108000000000 svcn: 4 rebuild_timeout: 240 properties: scrub:timed + container: type: POSIX control_method: daos oclass: RP_3G6 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:2 + dkeys: single: no_of_dkeys: - 50 + akeys: single: no_of_akeys: - 10 + record: 1KB: length: - 1024 + ior: clientslots: slots: 48 @@ -69,6 +75,7 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [12000000000, 108000000000, 500000, 500000000] + mdtest: api: DFS client_processes: @@ -87,21 +94,28 @@ mdtest: read_bytes: 32768 verbosity_value: 1 depth: 0 + test_obj_class: oclass: - RP_2G8 - RP_4G1 - EC_2P1G1 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false + snapshot: test_with_snapshot: true + test_ranks: rank_list: ["2", "5"] + pool_capacity: pool_fillup: 10 pool_test_oclass: RP_2GX diff --git a/src/tests/ftest/osa/offline_extend.yaml b/src/tests/ftest/osa/offline_extend.yaml index 810f1211ade..9f4bdf4d90f 100644 --- a/src/tests/ftest/osa/offline_extend.yaml +++ b/src/tests/ftest/osa/offline_extend.yaml @@ -1,12 +1,17 @@ hosts: test_servers: server-[1-2] test_clients: 1 + extra_servers: test_servers: server-3 + timeout: 1100 + setup: start_servers_once: false + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -14,8 +19,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -24,24 +27,25 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 6000000000 nvme_size: 54000000000 svcn: 2 control_method: dmg properties: scrub:lazy + container: type: POSIX control_method: daos oclass: RP_2G1 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:1 + ior: clientslots: slots: 48 @@ -59,6 +63,7 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [6000000000, 54000000000, 500000, 500000000] + mdtest: api: DFS client_processes: @@ -77,19 +82,26 @@ mdtest: read_bytes: 32768 verbosity_value: 1 depth: 0 + test_obj_class: oclass: - RP_2G8 - EC_2P1G1 + loop_test: iterations: 3 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false + snapshot: test_with_snapshot: true + test_ranks: rank_list: ["4", "5"] diff --git a/src/tests/ftest/osa/offline_parallel_test.yaml b/src/tests/ftest/osa/offline_parallel_test.yaml index e8dd4563339..b17bf53705f 100644 --- a/src/tests/ftest/osa/offline_parallel_test.yaml +++ b/src/tests/ftest/osa/offline_parallel_test.yaml @@ -1,12 +1,17 @@ hosts: test_servers: server-[1-2] test_clients: 1 + extra_servers: test_servers: server-3 + timeout: 700 + setup: start_servers_once: false + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -14,8 +19,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -24,22 +27,23 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 6000000000 nvme_size: 54000000000 svcn: 4 + container: type: POSIX control_method: daos oclass: RP_2G8 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:1 + ior: clientslots: slots: 48 @@ -57,6 +61,7 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [6000000000, 54000000000, 500000, 500000000] + mdtest: api: DFS client_processes: @@ -75,16 +80,22 @@ mdtest: read_bytes: 32768 verbosity_value: 1 depth: 0 + test_obj_class: oclass: - RP_2G8 + loop_test: iterations: 3 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false + system_stop_start: flags: true diff --git a/src/tests/ftest/osa/offline_reintegration.yaml b/src/tests/ftest/osa/offline_reintegration.yaml index 68b37b2e363..1741381db9a 100644 --- a/src/tests/ftest/osa/offline_reintegration.yaml +++ b/src/tests/ftest/osa/offline_reintegration.yaml @@ -1,12 +1,17 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 1300 + timeouts: test_osa_offline_reintegrate_with_less_pool_space: 1800 + setup: start_servers_once: false + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -14,8 +19,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -24,8 +27,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: @@ -33,12 +34,15 @@ server_config: storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + pool: scm_size: 6000000000 nvme_size: 54000000000 @@ -47,11 +51,13 @@ pool: rebuild_timeout: 240 pool_query_timeout: 30 properties: scrub:timed,scrub_freq:1 + container: type: POSIX control_method: daos oclass: RP_3G6 properties: cksum:crc64,cksum_size:16384,srv_cksum:on,rd_fac:2 + ior: clientslots: slots: 48 @@ -69,6 +75,7 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [6000000000, 54000000000, 500000, 500000000] + mdtest: api: DFS client_processes: @@ -87,24 +94,33 @@ mdtest: read_bytes: 32768 verbosity_value: 1 depth: 0 + test_obj_class: oclass: - RP_4G1 - EC_2P2G1 + loop_test: iterations: 3 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false + test_rf: test_with_rf: true + blank_node: test_with_blank_node: true + snapshot: test_with_snapshot: true + pool_capacity: pool_fillup: 10 pool_test_oclass: RP_2GX diff --git a/src/tests/ftest/osa/online_drain.yaml b/src/tests/ftest/osa/online_drain.yaml index ea59572d8f4..dd75e750062 100644 --- a/src/tests/ftest/osa/online_drain.yaml +++ b/src/tests/ftest/osa/online_drain.yaml @@ -1,12 +1,17 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 1000 + job_manager: manager_timeout: 300 + setup: start_servers_once: false + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -14,8 +19,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -24,13 +27,12 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 12000000000 nvme_size: 108000000000 @@ -39,11 +41,13 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: scrub:timed,scrub_freq:1 + container: type: POSIX control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 oclass: RP_2G4 + ior: client_processes: np: 2 @@ -61,6 +65,7 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [4000000000, 18000000000, 40000, 500000000, PASS] # [4G, 18G, 40K, 510M, PASS] + mdtest: api: DFS client_processes: @@ -79,19 +84,25 @@ mdtest: read_bytes: 32768 verbosity_value: 1 depth: 0 + daos_racer: runtime: 480 clush_timeout: 1000 + test_obj_class: oclass: - RP_3G6 - RP_4G1 - S1 + loop_test: iterations: 3 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false diff --git a/src/tests/ftest/osa/online_extend.yaml b/src/tests/ftest/osa/online_extend.yaml index 34a4dad63a7..7ebb73e9fc5 100644 --- a/src/tests/ftest/osa/online_extend.yaml +++ b/src/tests/ftest/osa/online_extend.yaml @@ -1,18 +1,24 @@ hosts: test_servers: server-[1-2] test_clients: 1 + # If we define the server under test_servers, launch.py will convert it to the # actual server name passed into --test_servers. If above test_servers is hosts, # it'll be used as one of the servers at test startup time, so use something # other than hosts. extra_servers: test_servers: server-3 + timeout: 1000 + job_manager: manager_timeout: 330 + setup: start_servers_once: false + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -20,8 +26,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -30,13 +34,12 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 12000000000 nvme_size: 108000000000 @@ -45,11 +48,13 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: scrub:lazy + container: type: POSIX control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 oclass: RP_2G1 + ior: client_processes: np: 2 @@ -67,6 +72,7 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [4000000000, 18000000000, 40000, 500000000, PASS] # [4G, 18G, 40K, 510M, PASS] + mdtest: api: DFS client_processes: @@ -85,19 +91,26 @@ mdtest: read_bytes: 32768 verbosity_value: 1 depth: 0 + daos_racer: runtime: 480 clush_timeout: 1000 + test_obj_class: oclass: - S1 + loop_test: iterations: 3 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false + test_ranks: rank_list: ["4,5"] diff --git a/src/tests/ftest/osa/online_parallel_test.yaml b/src/tests/ftest/osa/online_parallel_test.yaml index 468add98ad6..b9126691131 100644 --- a/src/tests/ftest/osa/online_parallel_test.yaml +++ b/src/tests/ftest/osa/online_parallel_test.yaml @@ -1,10 +1,14 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 1110 + job_manager: manager_timeout: 400 + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +16,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -22,23 +24,24 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 12000000000 nvme_size: 108000000000 svcn: 4 control_method: dmg + container: type: POSIX control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on oclass: RP_2G1 + ior: no_parallel_job: 2 client_processes: @@ -58,6 +61,7 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [4000000000, 18000000000, 4000, 50000000, PASS] # [4G, 18G, 4K, 51M, PASS] + daos_racer: runtime: 480 clush_timeout: 1000 diff --git a/src/tests/ftest/osa/online_reintegration.yaml b/src/tests/ftest/osa/online_reintegration.yaml index f47e198dc52..369be9079cf 100644 --- a/src/tests/ftest/osa/online_reintegration.yaml +++ b/src/tests/ftest/osa/online_reintegration.yaml @@ -1,12 +1,17 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 1110 + job_manager: manager_timeout: 300 + setup: start_servers_once: false + skip_add_log_msg: true + server_config: name: daos_server engines_per_host: 2 @@ -14,8 +19,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -24,13 +27,12 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 12000000000 nvme_size: 108000000000 @@ -39,11 +41,13 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: scrub:timed + container: type: POSIX control_method: daos properties: cksum:crc16,cksum_size:16384,srv_cksum:on,rd_fac:1 oclass: RP_2G1 + ior: client_processes: np: 2 @@ -61,9 +65,11 @@ ior: # The values are set to be in the multiples of 10. # Values are appx GB. - [4000000000, 18000000000, 40000, 500000000, PASS] # [4G, 18G, 40K, 510M, PASS] + daos_racer: runtime: 480 clush_timeout: 1000 + mdtest: api: DFS client_processes: @@ -82,15 +88,20 @@ mdtest: read_bytes: 32768 verbosity_value: 1 depth: 0 + test_obj_class: oclass: - RP_3G6 - RP_4G1 + loop_test: iterations: 3 + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true + checksum: test_with_checksum: false diff --git a/src/tests/ftest/performance/ior_easy.yaml b/src/tests/ftest/performance/ior_easy.yaml index b846b179277..0b515361fa2 100644 --- a/src/tests/ftest/performance/ior_easy.yaml +++ b/src/tests/ftest/performance/ior_easy.yaml @@ -12,16 +12,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto diff --git a/src/tests/ftest/performance/ior_hard.yaml b/src/tests/ftest/performance/ior_hard.yaml index 91b897dbb0b..fb09a7514a5 100644 --- a/src/tests/ftest/performance/ior_hard.yaml +++ b/src/tests/ftest/performance/ior_hard.yaml @@ -12,16 +12,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto diff --git a/src/tests/ftest/performance/mdtest_easy.yaml b/src/tests/ftest/performance/mdtest_easy.yaml index d2925536b79..02070bbcbaa 100644 --- a/src/tests/ftest/performance/mdtest_easy.yaml +++ b/src/tests/ftest/performance/mdtest_easy.yaml @@ -12,16 +12,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto diff --git a/src/tests/ftest/performance/mdtest_hard.yaml b/src/tests/ftest/performance/mdtest_hard.yaml index 0599ea61319..949cfb93111 100644 --- a/src/tests/ftest/performance/mdtest_hard.yaml +++ b/src/tests/ftest/performance/mdtest_hard.yaml @@ -12,16 +12,12 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR storage: auto diff --git a/src/tests/ftest/pool/create.yaml b/src/tests/ftest/pool/create.yaml index 1b41ca681a5..4b1be3a422c 100644 --- a/src/tests/ftest/pool/create.yaml +++ b/src/tests/ftest/pool/create.yaml @@ -1,11 +1,13 @@ hosts: test_servers: 3 test_clients: 1 + timeouts: test_create_max_pool_scm_only: 180 test_create_max_pool: 300 test_create_no_space: 300 test_create_no_space_loop: 3500 + server_config: name: daos_server engines_per_host: 2 @@ -13,22 +15,20 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool_1: control_method: dmg scm_size: 1 svcn: 1 quantity: 1 + pool_2: control_method: dmg size: 90% diff --git a/src/tests/ftest/pool/create_all_hw.yaml b/src/tests/ftest/pool/create_all_hw.yaml index b47802955d6..c4fcf5cb770 100644 --- a/src/tests/ftest/pool/create_all_hw.yaml +++ b/src/tests/ftest/pool/create_all_hw.yaml @@ -44,8 +44,6 @@ server_config: engines: 0: pinned_numa_node: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: 0: @@ -57,8 +55,6 @@ server_config: bdev_list: ["aaaa:aa:aa.a"] 1: pinned_numa_node: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: 0: diff --git a/src/tests/ftest/pool/create_capacity.yaml b/src/tests/ftest/pool/create_capacity.yaml index 1eee1e71e6a..c9a6039762c 100644 --- a/src/tests/ftest/pool/create_capacity.yaml +++ b/src/tests/ftest/pool/create_capacity.yaml @@ -14,8 +14,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG targets: 1 @@ -28,8 +26,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG targets: 1 diff --git a/src/tests/ftest/pool/target_query.yaml b/src/tests/ftest/pool/target_query.yaml index 74932be2867..149d9a1003e 100644 --- a/src/tests/ftest/pool/target_query.yaml +++ b/src/tests/ftest/pool/target_query.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 5 test_clients: 1 + timeout: 300 + server_config: name: daos_server engines_per_host: 2 @@ -9,27 +11,26 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log targets: 2 storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31517 log_file: daos_server1.log targets: 2 storage: auto + pool: scm_size: 2G nvme_size: 16G control_method: dmg pool_query_timeout: 30 + container: type: POSIX control_method: daos + ior: api: "DFS" client_processes: diff --git a/src/tests/ftest/rebuild/container_create_race.yaml b/src/tests/ftest/rebuild/container_create_race.yaml index 46b8fe2791a..8ce8edd930a 100644 --- a/src/tests/ftest/rebuild/container_create_race.yaml +++ b/src/tests/ftest/rebuild/container_create_race.yaml @@ -13,8 +13,6 @@ server_config: targets: 2 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: 0: @@ -24,8 +22,6 @@ server_config: targets: 2 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: 0: diff --git a/src/tests/ftest/rebuild/continues_after_stop.yaml b/src/tests/ftest/rebuild/continues_after_stop.yaml index 5f332674687..85861c95d1a 100644 --- a/src/tests/ftest/rebuild/continues_after_stop.yaml +++ b/src/tests/ftest/rebuild/continues_after_stop.yaml @@ -11,15 +11,11 @@ server_config: 0: targets: 4 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server_0.log storage: auto 1: targets: 4 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server_1.log storage: auto diff --git a/src/tests/ftest/rebuild/mdtest.yaml b/src/tests/ftest/rebuild/mdtest.yaml index 37022e4e44f..07d11c38d12 100644 --- a/src/tests/ftest/rebuild/mdtest.yaml +++ b/src/tests/ftest/rebuild/mdtest.yaml @@ -12,8 +12,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: INFO storage: auto @@ -21,8 +19,6 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: INFO storage: auto diff --git a/src/tests/ftest/rebuild/no_cap.yaml b/src/tests/ftest/rebuild/no_cap.yaml index f55793eebf9..0e96b469172 100644 --- a/src/tests/ftest/rebuild/no_cap.yaml +++ b/src/tests/ftest/rebuild/no_cap.yaml @@ -3,7 +3,9 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 360 + server_config: name: daos_server # reduce cart timeout to make IV update return timeout @@ -15,21 +17,19 @@ server_config: targets: 1 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: targets: 1 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + container: control_method: daos properties: "rd_fac:1" + pool: scm_size: 1G control_method: dmg @@ -37,5 +37,6 @@ pool: pool_query_interval: 1 test_data_list: [1048576] oclass: "OC_RP_4G1" + rebuild: rank_to_kill: 1 diff --git a/src/tests/ftest/rebuild/pool_destroy_race.yaml b/src/tests/ftest/rebuild/pool_destroy_race.yaml index 694211cb881..e510b485785 100644 --- a/src/tests/ftest/rebuild/pool_destroy_race.yaml +++ b/src/tests/ftest/rebuild/pool_destroy_race.yaml @@ -14,16 +14,12 @@ server_config: targets: 4 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: targets: 4 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/rebuild/with_ior.yaml b/src/tests/ftest/rebuild/with_ior.yaml index 963180310ea..34c6f2d9eda 100644 --- a/src/tests/ftest/rebuild/with_ior.yaml +++ b/src/tests/ftest/rebuild/with_ior.yaml @@ -3,9 +3,11 @@ hosts: test_clients: 1 timeout: 360 + agent_config: #cache_expiration: 1 disable_caching: true + server_config: name: daos_server engines_per_host: 2 @@ -14,8 +16,6 @@ server_config: targets: 2 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: INFO storage: auto @@ -23,8 +23,6 @@ server_config: targets: 2 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: INFO storage: auto diff --git a/src/tests/ftest/recovery/cat_recov_core.yaml b/src/tests/ftest/recovery/cat_recov_core.yaml index 23200a8b403..8e4553e30ec 100644 --- a/src/tests/ftest/recovery/cat_recov_core.yaml +++ b/src/tests/ftest/recovery/cat_recov_core.yaml @@ -8,8 +8,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -23,8 +21,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 0 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: diff --git a/src/tests/ftest/recovery/ms_membership.yaml b/src/tests/ftest/recovery/ms_membership.yaml index e4157dae333..3e82da75b68 100644 --- a/src/tests/ftest/recovery/ms_membership.yaml +++ b/src/tests/ftest/recovery/ms_membership.yaml @@ -9,15 +9,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto system_ram_reserved: 1 diff --git a/src/tests/ftest/recovery/pool_membership.yaml b/src/tests/ftest/recovery/pool_membership.yaml index c18f0539c2c..100bacb23fa 100644 --- a/src/tests/ftest/recovery/pool_membership.yaml +++ b/src/tests/ftest/recovery/pool_membership.yaml @@ -8,17 +8,13 @@ server_config: engines: 0: storage: auto - fabric_iface_port: 31416 log_file: daos_server_0.log pinned_numa_node: 0 - fabric_iface: ib0 targets: 8 1: storage: auto - fabric_iface_port: 31516 log_file: daos_server_1.log pinned_numa_node: 1 - fabric_iface: ib1 targets: 8 pool: diff --git a/src/tests/ftest/scrubber/aggregation.yaml b/src/tests/ftest/scrubber/aggregation.yaml index ba0834b67ad..7b113aab1d3 100644 --- a/src/tests/ftest/scrubber/aggregation.yaml +++ b/src/tests/ftest/scrubber/aggregation.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 660 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +15,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -23,23 +24,24 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: size: 80% svcn: 4 control_method: dmg rebuild_timeout: 120 pool_query_timeout: 30 + container: type: POSIX control_method: daos properties: "cksum:sha512,rd_fac:1" + ior: &ior_base ior_timeout: 60 test_file: daos:testFile @@ -47,16 +49,19 @@ ior: &ior_base flags: "-v -W -w -r -R -k" api: DFS dfs_oclass: RP_2GX + ior_small_block_size: <<: *ior_base transfer_size: 5M block_size: 250M + ior_large_block_size: <<: *ior_base transfer_size: 1M block_size: 20G client_processes: np: 6 + faults: fault_list: - DAOS_DELAYED_CSUM_CORRUPT_DISK diff --git a/src/tests/ftest/scrubber/basic.yaml b/src/tests/ftest/scrubber/basic.yaml index ff35bf52a72..a355641e63f 100644 --- a/src/tests/ftest/scrubber/basic.yaml +++ b/src/tests/ftest/scrubber/basic.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 150 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -11,8 +14,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -21,8 +22,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: @@ -30,12 +29,15 @@ server_config: storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + pool: scm_size: 6000000000 nvme_size: 54000000000 @@ -44,10 +46,12 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: "scrub:timed,scrub_freq:1" + container: type: POSIX control_method: daos oclass: RP_2G1 + ior: ior_timeout: 60 client_processes: diff --git a/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml b/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml index 25e87b233a5..962a5fb73e9 100644 --- a/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml +++ b/src/tests/ftest/scrubber/check_csum_metrics_mdtest.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 2 + timeout: 360 + server_config: name: daos_server engines_per_host: 2 @@ -10,8 +12,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -20,23 +20,24 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=csum,mgmt,md,rebuild storage: auto + pool: size: 50% svcn: 4 pool_query_timeout: 30 properties: "scrub:timed,scrub_freq:1" + container: type: POSIX control_method: daos oclass: RP_2G1 properties: cksum:crc16,cksum_size:16384,srv_cksum:on + mdtest: client_processes: ppn: 4 diff --git a/src/tests/ftest/scrubber/csum_fault.yaml b/src/tests/ftest/scrubber/csum_fault.yaml index b50f07191b4..5f853d7f63e 100644 --- a/src/tests/ftest/scrubber/csum_fault.yaml +++ b/src/tests/ftest/scrubber/csum_fault.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 150 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +15,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -23,8 +24,6 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: @@ -32,12 +31,15 @@ server_config: storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + pool: scm_size: 6G nvme_size: 54G @@ -46,11 +48,13 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: "scrub:timed,scrub_freq:1" + container: type: POSIX control_method: daos oclass: RP_2GX properties: "cksum:crc16" + ior: ior_timeout: 60 client_processes: @@ -69,6 +73,7 @@ ior: - [1M, 2G] obj_class: - RP_2GX + faults: fault_list: - DAOS_CSUM_CORRUPT_DISK diff --git a/src/tests/ftest/scrubber/frequency.yaml b/src/tests/ftest/scrubber/frequency.yaml index 14cc19321f0..f5b92ba96c9 100644 --- a/src/tests/ftest/scrubber/frequency.yaml +++ b/src/tests/ftest/scrubber/frequency.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 1800 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -11,8 +14,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -21,13 +22,12 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 6000000000 nvme_size: 54000000000 @@ -35,10 +35,12 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: "scrub:timed" + container: type: POSIX control_method: daos oclass: RP_2G1 + ior: ior_timeout: 60 client_processes: diff --git a/src/tests/ftest/scrubber/rebuild.yaml b/src/tests/ftest/scrubber/rebuild.yaml index 857db2728a2..1aec37e0ab8 100644 --- a/src/tests/ftest/scrubber/rebuild.yaml +++ b/src/tests/ftest/scrubber/rebuild.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 400 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +15,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -23,13 +24,12 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 6G nvme_size: 54G @@ -38,11 +38,13 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: "scrub:timed,scrub_freq:1,scrub_thresh:2" + container: type: POSIX control_method: daos oclass: RP_2GX properties: "cksum:sha256,rd_fac:1" + ior: ior_timeout: 60 client_processes: @@ -56,6 +58,7 @@ ior: block_size: 2G dfs_oclass: RP_2GX dfs_dir_oclass: RP_2GX + faults: fault_list: - DAOS_CSUM_CORRUPT_DISK diff --git a/src/tests/ftest/scrubber/snapshot.yaml b/src/tests/ftest/scrubber/snapshot.yaml index 8ae2be63c29..c1beb872238 100644 --- a/src/tests/ftest/scrubber/snapshot.yaml +++ b/src/tests/ftest/scrubber/snapshot.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 400 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +15,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -23,13 +24,12 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: - DD_MASK=mgmt,md,rebuild storage: auto + pool: scm_size: 6G nvme_size: 54G @@ -38,11 +38,13 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: "scrub:timed,scrub_freq:2" + container: type: POSIX control_method: daos oclass: RP_2GX properties: "cksum:crc64,rd_fac:1" + ior: ior_timeout: 60 client_processes: @@ -56,6 +58,7 @@ ior: block_size: 2G dfs_oclass: RP_2GX dfs_dir_oclass: RP_2GX + faults: fault_list: - DAOS_CSUM_CORRUPT_DISK diff --git a/src/tests/ftest/scrubber/target_auto_eviction.yaml b/src/tests/ftest/scrubber/target_auto_eviction.yaml index c07d125a5b0..15fabf06e44 100644 --- a/src/tests/ftest/scrubber/target_auto_eviction.yaml +++ b/src/tests/ftest/scrubber/target_auto_eviction.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 400 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -12,8 +15,6 @@ server_config: targets: 8 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -23,8 +24,6 @@ server_config: targets: 8 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: @@ -32,12 +31,15 @@ server_config: storage: auto transport_config: allow_insecure: true + agent_config: transport_config: allow_insecure: true + dmg: transport_config: allow_insecure: true + pool: scm_size: 6G nvme_size: 54G @@ -46,11 +48,13 @@ pool: rebuild_timeout: 120 pool_query_timeout: 30 properties: "scrub:timed,scrub_freq:1,scrub_thresh:2" + container: type: POSIX control_method: daos oclass: RP_2GX properties: "cksum:crc16" + ior: ior_timeout: 60 client_processes: @@ -64,6 +68,7 @@ ior: block_size: 2G dfs_oclass: RP_2GX dfs_dir_oclass: RP_2GX + faults: fault_list: - DAOS_CSUM_CORRUPT_DISK diff --git a/src/tests/ftest/server/cpu_usage.yaml b/src/tests/ftest/server/cpu_usage.yaml index 0c10ab84a43..a1bb895b98b 100644 --- a/src/tests/ftest/server/cpu_usage.yaml +++ b/src/tests/ftest/server/cpu_usage.yaml @@ -1,26 +1,31 @@ hosts: test_servers: 1 test_clients: 1 + timeout: 130 + server_config: engines_per_host: 1 engines: 0: targets: 8 nr_xs_helpers: 8 - fabric_iface: ib0 storage: auto + ior: client_processes: np: 1 flags: "-v -D 60 -w -r" transfer_size: 1M block_size: 1G + pool: scm_size: 10G nvme_size: 100G control_method: dmg + 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 6ff7cb79582..d2813fde52b 100644 --- a/src/tests/ftest/server/daos_server_restart.yaml +++ b/src/tests/ftest/server/daos_server_restart.yaml @@ -15,15 +15,11 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto diff --git a/src/tests/ftest/server/metadata.yaml b/src/tests/ftest/server/metadata.yaml index 517b627e960..bee1a57672f 100644 --- a/src/tests/ftest/server/metadata.yaml +++ b/src/tests/ftest/server/metadata.yaml @@ -17,8 +17,6 @@ server_config: nr_xs_helpers: 4 first_core: 0 pinned_numa_node: 0 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: DEBUG,MEM=ERR env_vars: @@ -34,8 +32,6 @@ server_config: nr_xs_helpers: 4 first_core: 0 pinned_numa_node: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: DEBUG,MEM=ERR env_vars: diff --git a/src/tests/ftest/server/storage_tiers.yaml b/src/tests/ftest/server/storage_tiers.yaml index 6edced47786..6529446c22d 100644 --- a/src/tests/ftest/server/storage_tiers.yaml +++ b/src/tests/ftest/server/storage_tiers.yaml @@ -14,15 +14,11 @@ timeout: 30 engine_0: &engine_0_base pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log engine_1: &engine_1_base pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage_0: &storage_dcpm diff --git a/src/tests/ftest/soak/faults.yaml b/src/tests/ftest/soak/faults.yaml index 165cb573031..4ce3c4880d6 100644 --- a/src/tests/ftest/soak/faults.yaml +++ b/src/tests/ftest/soak/faults.yaml @@ -22,7 +22,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 2 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR env_vars: @@ -31,7 +30,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 2 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR env_vars: diff --git a/src/tests/ftest/soak/harassers.yaml b/src/tests/ftest/soak/harassers.yaml index af7065fb3d8..a2032e85d61 100644 --- a/src/tests/ftest/soak/harassers.yaml +++ b/src/tests/ftest/soak/harassers.yaml @@ -22,7 +22,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 2 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: INFO env_vars: @@ -32,7 +31,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 2 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: INFO env_vars: diff --git a/src/tests/ftest/soak/smoke.yaml b/src/tests/ftest/soak/smoke.yaml index ca1d4fb7a4c..948fe1f8802 100644 --- a/src/tests/ftest/soak/smoke.yaml +++ b/src/tests/ftest/soak/smoke.yaml @@ -24,7 +24,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 2 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR env_vars: @@ -33,7 +32,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 2 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR env_vars: diff --git a/src/tests/ftest/soak/stress.yaml b/src/tests/ftest/soak/stress.yaml index 15a6a3033a3..b3e9b87dd91 100644 --- a/src/tests/ftest/soak/stress.yaml +++ b/src/tests/ftest/soak/stress.yaml @@ -27,7 +27,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 2 - fabric_iface_port: 31317 log_file: daos_server0.log log_mask: ERR env_vars: @@ -37,7 +36,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 2 - fabric_iface_port: 31417 log_file: daos_server1.log log_mask: ERR env_vars: diff --git a/src/tests/ftest/telemetry/engine_events.yaml b/src/tests/ftest/telemetry/engine_events.yaml index 713eac94e9f..4fa3be16d3d 100644 --- a/src/tests/ftest/telemetry/engine_events.yaml +++ b/src/tests/ftest/telemetry/engine_events.yaml @@ -9,14 +9,10 @@ server_config: 0: targets: 4 nr_xs_helpers: 0 - fabric_iface: ib0 - fabric_iface_port: 31416 log_file: daos_server_0.log storage: auto 1: targets: 4 nr_xs_helpers: 0 - fabric_iface: ib1 - fabric_iface_port: 31516 log_file: daos_server_1.log storage: auto diff --git a/src/tests/ftest/telemetry/pool_space_metrics.yaml b/src/tests/ftest/telemetry/pool_space_metrics.yaml index 9a2e261f6b2..a7c2632cb3b 100644 --- a/src/tests/ftest/telemetry/pool_space_metrics.yaml +++ b/src/tests/ftest/telemetry/pool_space_metrics.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 180 + server_config: name: daos_server engines_per_host: 2 @@ -10,28 +12,28 @@ server_config: targets: 4 pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_engine_0.log storage: auto 1: targets: 4 pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 32317 log_file: daos_engine_1.log storage: auto + pool_scm: scm_size: 1G nvme_size: 0 + pool_scm_nvme: size: 80% + container: type: POSIX control_method: daos properties: rd_fac:0 oclass: SX + ior: api: DFS transfer_size: 1048576 # 1MiB @@ -43,6 +45,7 @@ ior: dfs_destroy: false env_vars: - D_LOG_MASK=INFO + mpirun: args: "--bind-to socket" diff --git a/src/tests/ftest/util/environment_utils.py b/src/tests/ftest/util/environment_utils.py index bed802347f3..0adb48a495f 100644 --- a/src/tests/ftest/util/environment_utils.py +++ b/src/tests/ftest/util/environment_utils.py @@ -1,6 +1,6 @@ """ (C) Copyright 2018-2024 Intel Corporation. - (C) Copyright 2025 Hewlett Packard Enterprise Development LP + (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -10,9 +10,8 @@ from ClusterShell.NodeSet import NodeSet # pylint: disable=import-error,no-name-in-module -from util.host_utils import get_local_host from util.network_utils import (PROVIDER_ALIAS, SUPPORTED_PROVIDERS, NetworkException, - get_common_provider, get_fastest_interface) + get_common_provider, get_fastest_interfaces) from util.run_utils import run_remote @@ -172,7 +171,7 @@ def set_defaults(self, logger, servers=None, clients=None, provider=None, insecu if self.user_dir is None: self.user_dir = os.path.join(self.log_dir, "user") if self.interface is None: - self.interface = self._default_interface(logger, all_hosts) + self.interface = self._default_interface(logger, servers) if self.provider is None: self.provider = self._default_provider(logger, servers) if self.insecure_mode is None: @@ -327,15 +326,18 @@ def _default_interface(self, logger, hosts): Returns: str: the default interface; can be None """ - interface = os.environ.get("D_INTERFACE") - if interface is None and hosts: - # Find all the /sys/class/net interfaces on the launch node (excluding lo) - logger.debug("Detecting network devices - D_INTERFACE not set") - try: - interface = get_fastest_interface(logger, hosts | get_local_host()) - except NetworkException as error: - raise TestEnvironmentException("Error obtaining a default interface!") from error - return interface + if not hosts: + return None + + logger.debug( + "Detecting network devices on %s - %s not set", hosts, self.__ENV_VAR_MAP['interface']) + try: + interfaces = get_fastest_interfaces(logger, hosts) + except NetworkException as error: + raise TestEnvironmentException("Error obtaining a default interface!") from error + + logger.debug(" Found interface(s): %s", ",".join(interfaces)) + return ",".join(interfaces) @property def provider(self): @@ -373,12 +375,13 @@ def _default_provider(self, logger, hosts): Returns: str: the default provider; can be None """ - if not hosts: + if not hosts or self.interface is None: return None + first_interface = self.interface.split(",", maxsplit=1)[0] logger.debug( - "Detecting provider for %s - %s not set", - self.interface, self.__ENV_VAR_MAP['provider']) + "Detecting provider for %s on %s - %s not set", + first_interface, hosts, self.__ENV_VAR_MAP['provider']) provider = None supported = list(SUPPORTED_PROVIDERS) @@ -392,7 +395,7 @@ def _default_provider(self, logger, hosts): supported = list(filter(lambda x: 'verbs' not in x, supported)) # Detect all supported providers for this interface that are common to all of the hosts - common_providers = get_common_provider(logger, hosts, self.interface, supported) + common_providers = get_common_provider(logger, hosts, first_interface, supported) if common_providers: # Select the preferred found provider based upon SUPPORTED_PROVIDERS order logger.debug("Supported providers detected: %s", common_providers) @@ -404,9 +407,9 @@ def _default_provider(self, logger, hosts): # Report an error if a provider cannot be found if not provider: raise TestEnvironmentException( - f"Error obtaining a supported provider for {self.interface} from: {supported}") + f"Error obtaining a supported provider for {first_interface} from: {supported}") - logger.debug(" Found %s provider for %s", provider, self.interface) + logger.debug(" Found %s provider for %s", provider, first_interface) return provider @property diff --git a/src/tests/ftest/util/network_utils.py b/src/tests/ftest/util/network_utils.py index e3802364d8f..0a730622d85 100644 --- a/src/tests/ftest/util/network_utils.py +++ b/src/tests/ftest/util/network_utils.py @@ -1,5 +1,6 @@ """ (C) Copyright 2022-2024 Intel Corporation. + (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -384,8 +385,8 @@ def get_interface_providers(interface, provider_data): return providers -def get_fastest_interface(logger, hosts, verbose=True): - """Get the fastest active interface common to all hosts. +def get_fastest_interfaces(logger, hosts, verbose=True): + """Get the fastest active interfaces common to all hosts. Args: logger (Logger): logger for the messages produced by this method @@ -396,12 +397,12 @@ def get_fastest_interface(logger, hosts, verbose=True): NetworkException: if there is an error detecting the fastest active interface Returns: - str: the fastest active interface common to all hosts specified + list: the fastest active interfaces common to all hosts specified """ common_interfaces = get_common_interfaces(logger, hosts, verbose) # Find the speed of each common active interface in order to be able to choose the fastest - interface_speeds = {} + interfaces_at_speed = {} for interface in common_interfaces: detected_speeds = get_interface_speeds(logger, hosts, interface, verbose) speed_list = [] @@ -411,26 +412,22 @@ def get_fastest_interface(logger, hosts, verbose=True): speed_hosts.add(node_set) if speed_list and speed_hosts == hosts: # Only include interface speeds if a speed is detected on all the hosts - interface_speeds[interface] = min(speed_list) + min_speed = min(speed_list) + if min_speed not in interfaces_at_speed: + interfaces_at_speed[min_speed] = [] + interfaces_at_speed[min_speed].append(interface) + fastest_interfaces = None logger.info("Active network interface speeds on %s:", hosts) - available_interfaces = {} - for interface in sorted(interface_speeds): - logger.info(" - %-8s (speed: %6s)", interface, interface_speeds[interface]) - - # Only include the first active interface (as determined by alphabetic sort) for each speed - if interface_speeds[interface] not in available_interfaces: - available_interfaces[interface_speeds[interface]] = interface - - logger.info("Available interfaces on %s: %s", hosts, available_interfaces) - try: - # Select the fastest active interface available by sorting the speed - interface = available_interfaces[sorted(available_interfaces)[-1]] - except IndexError as error: - raise NetworkException("Error obtaining a default interface!") from error - - logger.info("Fastest interface detected on %s: %s", hosts, interface) - return interface + for speed in sorted(interfaces_at_speed): + fastest_interfaces = sorted(interfaces_at_speed[speed]) + logger.info(" - speed: %7s => %s", speed, fastest_interfaces) + + if fastest_interfaces is None: + raise NetworkException(f"Error obtaining default interfaces w/ equal speed on {hosts}!") + + logger.info("Fastest interfaces detected on %s: %s", hosts, fastest_interfaces) + return fastest_interfaces def get_common_provider(logger, hosts, interface, supported=None, verbose=True): diff --git a/src/tests/ftest/util/server_utils_params.py b/src/tests/ftest/util/server_utils_params.py index 996f380b004..792ba47bffa 100644 --- a/src/tests/ftest/util/server_utils_params.py +++ b/src/tests/ftest/util/server_utils_params.py @@ -1,6 +1,6 @@ """ (C) Copyright 2020-2024 Intel Corporation. - (C) Copyright 2025 Hewlett Packard Enterprise Development LP + (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -472,9 +472,19 @@ def __init__(self, base_namespace, index, provider=None, max_storage_tiers=MAX_S self._max_storage_tiers = max_storage_tiers super().__init__(os.path.join(*namespace)) - # Use environment variables to get default parameters - default_interface = os.environ.get("DAOS_TEST_FABRIC_IFACE", "eth0") - default_port = int(os.environ.get("D_PORT", 31416)) + # Use environment variables to get default parameters. Supports lists to define values for + # multiple engines through comma-separated strings. If the index exceeds the list length + # then values are reused round-robin style. + try: + _defaults = os.environ.get("DAOS_TEST_FABRIC_IFACE").split(",") + default_interface = list(filter(None, _defaults))[index % len(_defaults)] + except (AttributeError, IndexError): + default_interface = f"eth{index}" + try: + _defaults = [int(port) for port in os.environ.get("D_PORT").split(",")] + default_port = list(filter(None, _defaults))[index % len(_defaults)] + except (AttributeError, ValueError, IndexError): + default_port = 31317 + (100 * index) # All log files should be placed in the same directory on each host # to enable easy log file archiving by launch.py diff --git a/src/tests/ftest/vmd/fault_reintegration.yaml b/src/tests/ftest/vmd/fault_reintegration.yaml index 735e059937b..ed5bbd1a0c3 100644 --- a/src/tests/ftest/vmd/fault_reintegration.yaml +++ b/src/tests/ftest/vmd/fault_reintegration.yaml @@ -1,9 +1,12 @@ hosts: test_servers: 3 test_clients: 1 + timeout: 360 + setup: start_servers_once: false + server_config: name: daos_server engines_per_host: 2 @@ -11,28 +14,27 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: auto 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: auto + pool: size: 90% svcn: 3 rebuild_timeout: 120 pool_query_timeout: 30 + 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 + ior: client_processes: np: 48 @@ -49,7 +51,9 @@ ior: # - [transfersize, blocksize] # The values are set to be in the multiples of 10. - [4000, 5000000] # [4K, 5M] + aggregation: test_with_aggregation: true + rebuild: test_with_rebuild: true diff --git a/src/tests/ftest/vmd/led.yaml b/src/tests/ftest/vmd/led.yaml index 1dec111e091..e77437e6a35 100644 --- a/src/tests/ftest/vmd/led.yaml +++ b/src/tests/ftest/vmd/led.yaml @@ -1,7 +1,9 @@ hosts: test_servers: 2 test_clients: 1 + timeout: 300 + server_config: name: daos_server engines_per_host: 2 @@ -9,8 +11,6 @@ server_config: 0: pinned_numa_node: 0 nr_xs_helpers: 1 - fabric_iface: ib0 - fabric_iface_port: 31317 log_file: daos_server0.log storage: 0: @@ -24,8 +24,6 @@ server_config: 1: pinned_numa_node: 1 nr_xs_helpers: 1 - fabric_iface: ib1 - fabric_iface_port: 31417 log_file: daos_server1.log storage: 0: @@ -36,14 +34,17 @@ server_config: class: nvme bdev_list: ["bbbb:bb:bb.b"] bdev_class: nvme + pool: mode: 146 name: daos_server size: 50% properties: ec_cell_sz:128KiB + container: type: POSIX properties: cksum:crc16,cksum_size:16384,srv_cksum:on control_method: daos + dfuse: disable_caching: True