test_mkdir -p $DIR/$tdir
test_mkdir $DIR/$tdir/$tfile || error "mkdir $DIR/$tdir/$tfile failed"
cd $DIR/$tdir/$tfile || error "cd $DIR/$tdir/$tfile failed"
- test_mkdir -p lndir bar1 || error "mkdir lndir/bar1 failed"
+ test_mkdir -p lndir/bar1 || error "mkdir lndir/bar1 failed"
test_mkdir $DIR/$tdir/$tfile/$tfile || error "mkdir $tfile failed"
cd $tfile || error "cd $tfile failed"
ln -s .. dotdot || error "ln dotdot failed"
skip "no early lock cancel on server" && return 0
lru_resize_disable mdc
lru_resize_disable osc
- test_mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2
+ test_mkdir -p $DIR/$tdir/d1
+ test_mkdir -p $DIR/$tdir/d2
touch $DIR/$tdir/d1/f1
cancel_lru_locks mdc
stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 > /dev/null
test_mkdir -p $DIR/$tdir
lru_resize_disable mdc
lru_resize_disable osc
- test_mkdir -p $DIR/$tdir/d1 $DIR/$tdir/d2
+ test_mkdir -p $DIR/$tdir/d1
+ test_mkdir -p $DIR/$tdir/d2
dd if=/dev/zero of=$DIR/$tdir/d1/f1 count=1
dd if=/dev/zero of=$DIR/$tdir/d2/f2 count=1
cancel_lru_locks mdc
echo "$TESTLOG_PREFIX.$TESTNAME.$logname.$(hostname -s).log"
}
-# mkdir directory on different MDTs
+# make directory on different MDTs
test_mkdir() {
local option
local parent
local child
local path
- local dir
local rc=0
- if [ $# -eq 2 ]; then
- option=$1
- path=$2
- else
- path=$1
- fi
-
- child=${path##*/}
- parent=${path%/*}
+ case $# in
+ 1) path=$1;;
+ 2) option=$1
+ path=$2;;
+ *) error "Only creating single directory is supported";;
+ esac
- if [ "$parent" == "$child" ]; then
- parent=$(pwd)
- fi
+ child=$(basename $path)
+ parent=$(dirname $path)
- if [ "$option" == "-p" -a -d ${parent}/${child} ]; then
+ if [ "$option" == "-p" -a -d $parent/$child ]; then
return $rc
fi
- # it needs to check whether there is further / in child
- dir=$(echo $child | awk -F '/' '{print $2}')
- if [ ! -z "$dir" ]; then
- local subparent=$(echo $child | awk -F '/' '{ print $1 }')
- parent=${parent}"/"${subparent}
- child=$dir
- fi
-
if [ ! -d ${parent} ]; then
if [ "$option" == "-p" ]; then
mkdir -p ${parent}
fi
if [ $MDSCOUNT -le 1 ]; then
- mkdir $option ${parent}/${child} || rc=$?
+ mkdir $option $parent/$child || rc=$?
else
local mdt_idx=$($LFS getstripe -M $parent)
+ local test_num=$(echo $testnum | sed -e 's/[^0-9]*//g')
if [ "$mdt_idx" -ne 0 ]; then
- mkdir $option ${parent}/${child} || rc=$?
- return $rc
+ mkdir $option $parent/$child || rc=$?
+ else
+ mdt_idx=$((test_num % MDSCOUNT))
+ echo "mkdir $mdt_idx for $parent/$child"
+ $LFS setdirstripe -i $mdt_idx $parent/$child || rc=$?
fi
-
- local test_num=$(echo $testnum | sed -e 's/[^0-9]*//g')
- local mdt_idx=$((test_num % MDSCOUNT))
- echo "mkdir $mdt_idx for ${parent}/${child}"
- $LFS setdirstripe -i $mdt_idx ${parent}/${child} || rc=$?
fi
return $rc
}