Whamcloud - gitweb
LU-13057 tests: sanity-pcc test_1c: Failed to start copytool 57/36957/3
authorYang Sheng <ys@whamcloud.com>
Mon, 9 Dec 2019 07:34:00 +0000 (15:34 +0800)
committerAndreas Dilger <adilger@whamcloud.com>
Tue, 10 Dec 2019 23:12:20 +0000 (23:12 +0000)
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>
lustre/tests/test-framework.sh

index 53f40a7..78004fc 100755 (executable)
@@ -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"