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 <dalton.bohning@intel.com>
daos-stack · Jan 23, 2024 · a0c39e2 · a0c39e2
1 parent 7d05adb
commit a0c39e2
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 20 deletions.
diff --git a/src/tests/ftest/rebuild/cascading_failures.yaml b/src/tests/ftest/rebuild/cascading_failures.yaml
@@ -15,10 +15,8 @@ server_config:
           scm_mount: /mnt/daos
   system_ram_reserved: 1
 pool:
-  scm_size: 1073741824
-  svcn: 2
-  control_method: dmg
-  pool_query_timeout: 30
+  size: 1G
+  pool_query_timeout: 60
   properties: rd_fac:2
 container:
   akey_size: 5

diff --git a/src/tests/ftest/rebuild/container_rf.yaml b/src/tests/ftest/rebuild/container_rf.yaml
@@ -15,10 +15,8 @@ server_config:
           scm_mount: /mnt/daos
   system_ram_reserved: 1
 pool:
-  scm_size: 1073741824
-  svcn: 3
-  control_method: dmg
-  pool_query_timeout: 30
+  size: 1G
+  pool_query_timeout: 60
 container:
   control_method: daos
   cont_prop: !mux

diff --git a/src/tests/ftest/rebuild/delete_objects.yaml b/src/tests/ftest/rebuild/delete_objects.yaml
@@ -16,10 +16,8 @@ server_config:
   system_ram_reserved: 1
 pool:
   scm_size: 1073741824
-  svcn: 2
   debug: true
-  control_method: dmg
-  pool_query_timeout: 30
+  pool_query_timeout: 60
   properties: rd_fac:2
 container:
   akey_size: 5

diff --git a/src/tests/ftest/rebuild/read_array.yaml b/src/tests/ftest/rebuild/read_array.yaml
@@ -19,10 +19,8 @@ server_config:
           scm_mount: /mnt/daos
   system_ram_reserved: 1
 pool:
-  scm_size: 1073741824
-  svcn: 2
-  control_method: dmg
-  pool_query_timeout: 30
+  size: 1G
+  pool_query_timeout: 60
   properties: rd_fac:2
 container:
   object_qty: 10

diff --git 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
@@ -29,8 +29,7 @@ server_config:
 
 pool:
   scm_size: 6G
-  svcn: 3
-  control_method: dmg
+  properties: rd_fac:1
   pool_query_timeout: 30
 
 container: