From e4ff5ff9257765d196b7d8a462ea96472d957d89 Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Wed, 28 Sep 2022 09:54:33 -0700 Subject: [PATCH] EX-6014 tests: Revert "EX-4093 tests: hot-pools don't recreate pools" This reverts commit 116cbacc52d8 to resolve the hot-pools regression test failures. After running sub-test 1, the OST pools were destroyed by the following stack_trap in create_pool(): stack_trap "destroy_test_pools $fsname" EXIT If the pools are not recreated in the successive sub-tests, then they will fail. We have to revert commit 116cbacc52d8 before we find out a way to avoid triggering the stack_trap between sub-tests. Test-Parameters: trivial mdscount=2 mdtcount=4 \ testlist=parallel-scale-nfsv4,hot-pools Fixes: 116cbacc52d8 ("EX-4093 tests: hot-pools don't recreate pools") Change-Id: I464a1f9f380c55e70b78a0dd7e52723d5b0a298d Signed-off-by: Jian Yu Reviewed-on: https://review.whamcloud.com/48690 Reviewed-by: Alexandre Ioffe Reviewed-by: Alex Zhuravlev Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger --- lustre/tests/hot-pools.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lustre/tests/hot-pools.sh b/lustre/tests/hot-pools.sh index 805c2c2..9514f96 100755 --- a/lustre/tests/hot-pools.sh +++ b/lustre/tests/hot-pools.sh @@ -188,6 +188,9 @@ init_hot_pools_env() { changelog_register fi + # create OST pools + create_ost_pools + init_lamigo_vars init_lpurge_vars @@ -224,7 +227,6 @@ lpurge_logfile() { build_test_filter check_and_setup_lustre -create_ost_pools # lamigo operations check_one_lamigo_is_started() { @@ -2196,8 +2198,6 @@ test_72() { } run_test 72 "lamigo: --oss option and ALR delivery to lamigo" -destroy_test_pools $FSNAME - complete $SECONDS check_and_cleanup_lustre exit_status -- 1.8.3.1