From 0fdd529c0abf9739194fb4d0f76162f774d31204 Mon Sep 17 00:00:00 2001 From: Jeff Olivier Date: Mon, 24 Jun 2024 09:59:38 -0600 Subject: [PATCH] DAOS-16001 placement: fix cases for delay_rebuild (#14557) (#14626) Placement fixes for delayed rebuild * Note: this is just a partial backport of tests that changed since we backported it (See #14558) before it landed on master branch. Signed-off-by: Xuezhao Liu --- src/tests/ftest/rebuild/cascading_failures.py | 10 +++++----- src/tests/ftest/util/container_rf_test_base.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/tests/ftest/rebuild/cascading_failures.py b/src/tests/ftest/rebuild/cascading_failures.py index a17c6c6ffac..448280b9227 100644 --- a/src/tests/ftest/rebuild/cascading_failures.py +++ b/src/tests/ftest/rebuild/cascading_failures.py @@ -1,5 +1,5 @@ """ - (C) Copyright 2019-2022 Intel Corporation. + (C) Copyright 2019-2024 Intel Corporation. SPDX-License-Identifier: BSD-2-Clause-Patent """ @@ -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) @@ -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") diff --git a/src/tests/ftest/util/container_rf_test_base.py b/src/tests/ftest/util/container_rf_test_base.py index c5cfbf2b1a3..5124818e32a 100644 --- a/src/tests/ftest/util/container_rf_test_base.py +++ b/src/tests/ftest/util/container_rf_test_base.py @@ -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.