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-657 test: limit the write size in run_dd
[fs/lustre-release.git]
/
lustre
/
tests
/
test-framework.sh
diff --git
a/lustre/tests/test-framework.sh
b/lustre/tests/test-framework.sh
index
76c6c3a
..
41bdd07
100644
(file)
--- a/
lustre/tests/test-framework.sh
+++ b/
lustre/tests/test-framework.sh
@@
-1531,6
+1531,7
@@
TESTLOG_PREFIX=$TESTLOG_PREFIX \
TESTNAME=$TESTNAME \
DBENCH_LIB=$DBENCH_LIB \
DBENCH_SRC=$DBENCH_SRC \
TESTNAME=$TESTNAME \
DBENCH_LIB=$DBENCH_LIB \
DBENCH_SRC=$DBENCH_SRC \
+LFS=$LFS \
run_${load}.sh" &
local ppid=$!
log "Started client load: ${load} on $client"
run_${load}.sh" &
local ppid=$!
log "Started client load: ${load} on $client"
@@
-2598,8
+2599,9
@@
ostdevname() {
#if $OSTDEVn isn't defined, default is $OSTDEVBASE + num
eval DEVPTR=${!DEVNAME:=${OSTDEVBASE}${num}};;
zfs )
#if $OSTDEVn isn't defined, default is $OSTDEVBASE + num
eval DEVPTR=${!DEVNAME:=${OSTDEVBASE}${num}};;
zfs )
- #dataset name is independent of vdev device names
- eval DEVPTR=${FSNAME}-ost${num}/ost${num};;
+ #try $OSTDEVn then $OSTDEVBASE + num then zfs default
+ local foo=${OSTDEVBASE:-${FSNAME}-ost${num}/ost}${num}
+ eval DEVPTR=${!DEVNAME:=$foo};;
* )
error "unknown fstype!";;
esac
* )
error "unknown fstype!";;
esac
@@
-2638,8
+2640,9
@@
mdsdevname() {
#if $MDSDEVn isn't defined, default is $MDSDEVBASE + num
eval DEVPTR=${!DEVNAME:=${MDSDEVBASE}${num}};;
zfs )
#if $MDSDEVn isn't defined, default is $MDSDEVBASE + num
eval DEVPTR=${!DEVNAME:=${MDSDEVBASE}${num}};;
zfs )
- #dataset name is independent of vdev device names
- eval DEVPTR=${FSNAME}-mdt${num}/mdt${num};;
+ # try $MDSDEVn then $MDSDEVBASE + num then zfs default
+ local foo=${MDSDEVBASE:-${FSNAME}-mdt${num}/mdt}${num}
+ eval DEVPTR=${!DEVNAME:=$foo};;
* )
error "unknown fstype!";;
esac
* )
error "unknown fstype!";;
esac