From 57c89582d8a6df8ec8a81cfb8171f00e12801013 Mon Sep 17 00:00:00 2001 From: Dalton Bohning Date: Mon, 22 Jan 2024 23:42:30 +0000 Subject: [PATCH] DAOS-15002 test: use default pool svc for rebuild tests When possible, use the system default of svc_rf * 2 + 1 for rebuild tests instead of hardcoding to inappropriate values. Otherwise, update some tests with svnc: 5 to account for killing a rank. Test-tag: RbldCascadingFailures RbldDeleteObjects RbldReadArrayTest RbldContRfTest RbldWidelyStriped RbldWithIOR Test-repeat: 2 Skip-unit-tests: true Skip-fault-injection-test: true Required-githooks: true Signed-off-by: Dalton Bohning --- src/tests/ftest/rebuild/cascading_failures.yaml | 2 -- src/tests/ftest/rebuild/container_rf.yaml | 3 +-- src/tests/ftest/rebuild/delete_objects.yaml | 2 -- src/tests/ftest/rebuild/read_array.yaml | 2 -- src/tests/ftest/rebuild/widely_striped.yaml | 5 ++--- src/tests/ftest/rebuild/with_ior.yaml | 3 +-- 6 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/tests/ftest/rebuild/cascading_failures.yaml b/src/tests/ftest/rebuild/cascading_failures.yaml index 8b9b272b4bd0..ad78e2f944d5 100644 --- a/src/tests/ftest/rebuild/cascading_failures.yaml +++ b/src/tests/ftest/rebuild/cascading_failures.yaml @@ -16,8 +16,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - svcn: 2 - control_method: dmg pool_query_timeout: 30 properties: rd_fac:2 container: diff --git a/src/tests/ftest/rebuild/container_rf.yaml b/src/tests/ftest/rebuild/container_rf.yaml index eb436baa2d37..07b1e1881a8c 100644 --- a/src/tests/ftest/rebuild/container_rf.yaml +++ b/src/tests/ftest/rebuild/container_rf.yaml @@ -16,8 +16,7 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - svcn: 3 - control_method: dmg + svcn: 5 pool_query_timeout: 30 container: control_method: daos diff --git a/src/tests/ftest/rebuild/delete_objects.yaml b/src/tests/ftest/rebuild/delete_objects.yaml index bb99fe48d70a..e80a2aec9c4d 100644 --- a/src/tests/ftest/rebuild/delete_objects.yaml +++ b/src/tests/ftest/rebuild/delete_objects.yaml @@ -16,9 +16,7 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - svcn: 2 debug: true - control_method: dmg pool_query_timeout: 30 properties: rd_fac:2 container: diff --git a/src/tests/ftest/rebuild/read_array.yaml b/src/tests/ftest/rebuild/read_array.yaml index 6bb9e559a17a..e6662b9d9228 100644 --- a/src/tests/ftest/rebuild/read_array.yaml +++ b/src/tests/ftest/rebuild/read_array.yaml @@ -20,8 +20,6 @@ server_config: system_ram_reserved: 1 pool: scm_size: 1073741824 - svcn: 2 - control_method: dmg pool_query_timeout: 30 properties: rd_fac:2 container: diff --git a/src/tests/ftest/rebuild/widely_striped.yaml b/src/tests/ftest/rebuild/widely_striped.yaml index fdeb6090d11c..40853a14b20f 100644 --- a/src/tests/ftest/rebuild/widely_striped.yaml +++ b/src/tests/ftest/rebuild/widely_striped.yaml @@ -18,15 +18,14 @@ testparams: pool: scm_size: 10G nvme_size: 60G - svcn: 5 - control_method: dmg rebuild_timeout: 240 pool_query_timeout: 60 + properties: rd_fac:2 container: type: POSIX control_method: daos oclass: RP_3G1 - properties: "rd_fac:2" + properties: rd_fac:2 mdtest: api: DFS client_processes: diff --git a/src/tests/ftest/rebuild/with_ior.yaml b/src/tests/ftest/rebuild/with_ior.yaml index d58b65f9ea0a..44e02c613972 100644 --- a/src/tests/ftest/rebuild/with_ior.yaml +++ b/src/tests/ftest/rebuild/with_ior.yaml @@ -29,8 +29,7 @@ server_config: pool: scm_size: 6G - svcn: 3 - control_method: dmg + properties: rd_fac:1 pool_query_timeout: 30 container: