From 0dd0a540e4bbeab04eefd409ba9bb3c37624d96d Mon Sep 17 00:00:00 2001 From: Aurelien Degremont Date: Wed, 8 Jun 2022 07:49:32 +0000 Subject: [PATCH] LU-15921 tests: fix sanity-hsm 24c Fix bad copy-paste in test sanity-hsm 24c causing the test to save 3 different tunables, but actually restoring the same one three times. Also improve the code to support values including spaces. Test-Parameters: trivial testlist=sanity-hsm,sanity-pcc Fixes: 2042bce ("LU-9474 tests: rewrite copytool_setup to use stack_trap") Fixes: f172b11 ("LU-10092 llite: Add persistent cache on client") Change-Id: I34cc61515ebb862d5996f41cdb2055ac53ccac65 Signed-off-by: Aurelien Degremont Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/47564 Reviewed-by: Andreas Dilger Reviewed-by: Li Xi Reviewed-by: Arshad Hussain Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity-hsm.sh | 6 +++--- lustre/tests/test-framework.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh index 70e33e6..b8cc1af 100755 --- a/lustre/tests/sanity-hsm.sh +++ b/lustre/tests/sanity-hsm.sh @@ -1873,11 +1873,11 @@ test_24c() { # Save the default masks and check that cleanup_24c will # restore the request masks correctly. user_save=$(get_hsm_param user_request_mask) - stack_trap "set_hsm_param user_request_mask $user_save" EXIT + stack_trap "set_hsm_param user_request_mask '$user_save'" EXIT group_save=$(get_hsm_param group_request_mask) - stack_trap "set_hsm_param user_request_mask $group_save" EXIT + stack_trap "set_hsm_param group_request_mask '$group_save'" EXIT other_save=$(get_hsm_param other_request_mask) - stack_trap "set_hsm_param user_request_mask $other_save" EXIT + stack_trap "set_hsm_param other_request_mask '$other_save'" EXIT [ "$user_save" == RESTORE ] || error "user_request_mask is '$user_save' expected 'RESTORE'" diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 0b08461..6e18e19 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -10632,7 +10632,7 @@ mdts_set_param() { local mdtno local rc=0 if [[ "$value" != "" ]]; then - value="=$value" + value="='$value'" fi for mdtno in $(seq 1 $MDSCOUNT); do local idx=$(($mdtno - 1)) -- 1.8.3.1