From: Yang Sheng <ys@whamcloud.com>
Date: Mon, 9 Dec 2019 07:34:00 +0000 (+0800)
Subject: LU-13057 tests: sanity-pcc test_1c: Failed to start copytool
X-Git-Tag: 2.13.51~118
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=f51895b8dd26ef32af19723610718a6d41a3666c;hp=1140d209f0fb7a9200cc9c6d03553d02035ad6b8

LU-13057 tests: sanity-pcc test_1c: Failed to start copytool

Initialize default value while entry to ensure use correct value.

Signed-off-by: Yang Sheng <ys@whamcloud.com>
Change-Id: I6053f4c9e9cc655fdb1501c901aab81f4bd14987
Reviewed-on: https://review.whamcloud.com/36957
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: James Nunez <jnunez@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh
index 53f40a7..78004fc 100755
--- a/lustre/tests/test-framework.sh
+++ b/lustre/tests/test-framework.sh
@@ -9982,6 +9982,11 @@ copytool()
 	local action=$1
 	shift
 
+	# 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 misc_options
@@ -9989,11 +9994,11 @@ copytool()
 		case "$1" in
 		-f|--facet)
 			shift
-			local facet="$1"
+			facet="$1"
 			;;
 		-m|--mountpoint)
 			shift
-			local mountpoint="$1"
+			mountpoint="$1"
 			;;
 		-a|--archive-id)
 			shift
@@ -10001,7 +10006,7 @@ copytool()
 			;;
 		-h|--hsm-root)
 			shift
-			local hsm_root="$1"
+			hsm_root="$1"
 			;;
 		-b|--bwlimit)
 			shift
@@ -10018,11 +10023,6 @@ copytool()
 		shift
 	done
 
-	# Use default values if needed
-	local facet=${facet:-$SINGLEAGT}
-	local mountpoint="${mountpoint:-${MOUNT2:-$MOUNT}}"
-	local hsm_root="${hsm_root:-$(hsm_root "$facet")}"
-
 	stack_trap "do_facet $facet rm -rf '$hsm_root'" EXIT
 	do_facet $facet mkdir -p "$hsm_root" ||
 		error "mkdir '$hsm_root' failed"