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.

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-16001 placement: fix cases for delay_rebuild (#14557) #14626

Merged
merged 1 commit into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/tests/ftest/rebuild/cascading_failures.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""
(C) Copyright 2019-2022 Intel Corporation.
(C) Copyright 2019-2024 Intel Corporation.

SPDX-License-Identifier: BSD-2-Clause-Patent
"""
Expand Down Expand Up @@ -52,14 +52,14 @@ def start_rebuild(self):
"""Start the rebuild process."""
if self.mode == "simultaneous":
# Exclude both ranks from the pool to initiate rebuild
self.server_managers[0].stop_ranks(self.inputs.rank.value, self.d_log)
self.server_managers[0].stop_ranks(self.inputs.rank.value, self.d_log, force=True)
else:
# Exclude the first rank from the pool to initiate rebuild
self.server_managers[0].stop_ranks([self.inputs.rank.value[0]], self.d_log)
self.server_managers[0].stop_ranks([self.inputs.rank.value[0]], self.d_log, force=True)

if self.mode == "sequential":
# Exclude the second rank from the pool
self.server_managers[0].stop_ranks([self.inputs.rank.value[1]], self.d_log)
self.server_managers[0].stop_ranks([self.inputs.rank.value[1]], self.d_log, force=True)

# Wait for rebuild to start
self.pool.wait_for_rebuild_to_start(1)
Expand All @@ -69,7 +69,7 @@ def execute_during_rebuild(self):
self.daos_cmd = DaosCommand(self.bin)
if self.mode == "cascading":
# Exclude the second rank from the pool during rebuild
self.server_managers[0].stop_ranks([self.inputs.rank.value[1]], self.d_log)
self.server_managers[0].stop_ranks([self.inputs.rank.value[1]], self.d_log, force=True)

self.daos_cmd.container_set_prop(
pool=self.pool.uuid, cont=self.container.uuid, prop="status", value="healthy")
Expand Down
2 changes: 1 addition & 1 deletion src/tests/ftest/util/container_rf_test_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ def start_rebuild_cont_rf(self, rd_fac):

# Exclude the ranks from the pool to initiate rebuild simultaneously
self.log.info("==>(3)Start rebuild for all specified ranks simultaneously")
self.server_managers[0].stop_ranks(self.inputs.rank.value, self.d_log)
self.server_managers[0].stop_ranks(self.inputs.rank.value, self.d_log, force=True)

def execute_during_rebuild_cont_rf(self, rd_fac, expect_cont_status="HEALTHY"):
"""Execute test steps during rebuild.
Expand Down
Loading