From 030dd9e88ab9687aae7a7510147af1005930a2b1 Mon Sep 17 00:00:00 2001 From: Qian Yingjin Date: Thu, 7 Jul 2022 22:59:36 -0400 Subject: [PATCH] LU-15998 pcc: set hsm-root correctly during copytool setup During copytool setup, we set --hsm-root with the archive root path of $SINGLEAGT. However, when set --hsm-root explicitly via "-h|--hsm-root", it should reset the hsm root with the specified one. Otherwise, it will cuase sanity-pcc/test_3b failed. Test-Parameters: clientcount=3 testlist=sanity-pcc,sanity-pcc,sanity-pcc Signed-off-by: Qian Yingjin Change-Id: Ida6c1ff7459548b068fd62ce315fe8075633b5fc Signed-off-by: Yang Sheng Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/47909 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin --- lustre/tests/test-framework.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 5144b23..f89fcfb 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -10474,11 +10474,10 @@ copytool() # Use default values local facet=$SINGLEAGT local mountpoint="${MOUNT2:-$MOUNT}" - local hsm_root="${hsm_root:-$(hsm_root "$facet")}" # Parse arguments local fail_on_error=true - local -a hsmtool_options=("--hsm-root=$hsm_root") + local -a hsmtool_options=() local -a action_options=() if [[ -n "$HSMTOOL_ARCHIVE_FORMAT" ]]; then @@ -10505,7 +10504,7 @@ copytool() ;; -h|--hsm-root) shift - hsm_root="$1" + local hsm_root="$1" ;; -b|--bwlimit) shift @@ -10522,6 +10521,9 @@ copytool() shift done + local hsm_root="${hsm_root:-$(hsm_root "$facet")}" + hsmtool_options+=("--hsm-root=$hsm_root") + stack_trap "do_facet $facet rm -rf '$hsm_root'" EXIT do_facet $facet mkdir -p "$hsm_root" || error "mkdir '$hsm_root' failed" -- 1.8.3.1