Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DAOS-7115 test: Fix rebuild_test.py failing in CI #5226

Merged
merged 1 commit into from
Mar 30, 2021
Merged

DAOS-7115 test: Fix rebuild_test.py failing in CI #5226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions src/tests/ftest/pool/rebuild_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,23 @@ def run_rebuild_test(self, pool_quantity):
rank = self.params.get("rank", "/run/testparams/*")
obj_class = self.params.get("object_class", "/run/testparams/*")

# Create the pools and confirm their status
# Collect server configuration information
server_count = len(self.hostlist_servers)
engine_count = self.server_managers[0].get_config_value(
"engines_per_host")
engine_count = 1 if engine_count is None else int(engine_count)
target_count = int(self.server_managers[0].get_config_value("targets"))
self.log.info(
"Running with %s servers, %s engines per server, and %s targets "
"per engine", server_count, engine_count, target_count)

# Create the pools and confirm their status
status = True
for index in range(pool_quantity):
self.pool[index].create()
status &= self.pool[index].check_pool_info(
pi_nnodes=server_count,
pi_ntargets=server_count, # DAOS-2799
pi_nnodes=server_count * engine_count,
pi_ntargets=server_count * engine_count * target_count,
pi_ndisabled=0
)
status &= self.pool[index].check_rebuild_status(
Expand Down Expand Up @@ -94,9 +103,9 @@ def run_rebuild_test(self, pool_quantity):
status = True
for index in range(pool_quantity):
status &= self.pool[index].check_pool_info(
pi_nnodes=server_count,
pi_ntargets=server_count, # DAOS-2799
pi_ndisabled=1
pi_nnodes=server_count * engine_count,
pi_ntargets=server_count * engine_count * target_count,
pi_ndisabled=target_count
)
status &= self.pool[index].check_rebuild_status(
rs_done=1, rs_obj_nr=rs_obj_nr[index],
Expand All @@ -120,7 +129,10 @@ def test_simple_rebuild(self):
Use Cases:
single pool rebuild, single client, various record/object counts

:avocado: tags=all,daily_regression,large,pool,rebuild,rebuildsimple
:avocado: tags=all,daily_regression
:avocado: tags=vm,large
:avocado: tags=rebuild
:avocado: tags=pool,rebuild_tests,test_simple_rebuild
"""
self.run_rebuild_test(1)

Expand All @@ -134,6 +146,9 @@ def test_multipool_rebuild(self):
Use Cases:
multipool rebuild, single client, various object and record counts

:avocado: tags=all,daily_regression,large,pool,rebuild,rebuildmulti
:avocado: tags=all,daily_regression
:avocado: tags=vm,large
:avocado: tags=rebuild
:avocado: tags=pool,rebuild_tests,test_multipool_rebuild
"""
self.run_rebuild_test(self.params.get("quantity", "/run/testparams/*"))
2 changes: 1 addition & 1 deletion src/tests/ftest/pool/rebuild_tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ timeout: 600
server_config:
name: daos_server
servers:
targets: 8
targets: 2
pool:
mode: 511
name: daos_server
Expand Down