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 <degremoa@amazon.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/47564
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Li Xi <lixi@ddn.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>

diff --git a/lustre/tests/sanity-hsm.sh b/lustre/tests/sanity-hsm.sh
index 70e33e6..b8cc1af 100755 (executable)
--- 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 (executable)
--- 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))