Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
LU-13057 tests: sanity-pcc test_1c: Failed to start copytool
[fs/lustre-release.git]
/
lustre
/
tests
/
test-framework.sh
diff --git
a/lustre/tests/test-framework.sh
b/lustre/tests/test-framework.sh
index
53f40a7
..
78004fc
100755
(executable)
--- a/
lustre/tests/test-framework.sh
+++ b/
lustre/tests/test-framework.sh
@@
-9982,6
+9982,11
@@
copytool()
local action=$1
shift
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
# Parse arguments
local fail_on_error=true
local -a misc_options
@@
-9989,11
+9994,11
@@
copytool()
case "$1" in
-f|--facet)
shift
case "$1" in
-f|--facet)
shift
-
local
facet="$1"
+ facet="$1"
;;
-m|--mountpoint)
shift
;;
-m|--mountpoint)
shift
-
local
mountpoint="$1"
+ mountpoint="$1"
;;
-a|--archive-id)
shift
;;
-a|--archive-id)
shift
@@
-10001,7
+10006,7
@@
copytool()
;;
-h|--hsm-root)
shift
;;
-h|--hsm-root)
shift
-
local
hsm_root="$1"
+ hsm_root="$1"
;;
-b|--bwlimit)
shift
;;
-b|--bwlimit)
shift
@@
-10018,11
+10023,6
@@
copytool()
shift
done
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"
stack_trap "do_facet $facet rm -rf '$hsm_root'" EXIT
do_facet $facet mkdir -p "$hsm_root" ||
error "mkdir '$hsm_root' failed"