while [ "$1" ]; do
case $1 in
*.xml) export NAME=`echo $1 | sed "s/.xml//"` ;;
+ *) OPTS="$OPTS $1" ;;
esac
shift
done
-OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
-if [ -z "$OSCMT" ]; then
- sh llmount.sh
- OSCMT="`mount | awk '/ lustre_lite / { print $3 }' | tail -1`"
- [ -z "$OSCMT" ] && fail "no lustre filesystem mounted" 1
+MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
+if [ -z "$MOUNT" ]; then
+ sh llmount.sh $OPTS
+ MOUNT="`mount | awk '/ lustre_lite / { print $3 }' | tail -n 1`"
+ [ -z "$MOUNT" ] && fail "no lustre filesystem mounted" 1
I_MOUNTED="yes"
fi
-OSCTMP=`echo $OSCMT | tr "/" "."`
-USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
+OSCTMP=`echo $MOUNT | tr "/" "."`
+USED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
USED=`expr $USED + 16` # Some space for the status file
# let's start slowly here...
-log "touching $OSCMT"
-touch $OSCMT || fail "can't touch $OSCMT" 2
-HOSTS=$OSCMT/hosts.$$
-
-# this will cause the following cp to trigger bug #620096
-log "create an empty file $HOSTS"
-mcreate $HOSTS
-
-log "copying /etc/hosts to $HOSTS"
-cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS" 3
-log "comparing /etc/hosts and $HOSTS"
-diff -u /etc/hosts $HOSTS || fail "$HOSTS different" 4
-log "renaming $HOSTS to $HOSTS.ren"
-mv $HOSTS $HOSTS.ren || fail "can't rename $HOSTS to $HOSTS.ren" 5
-log "copying /etc/hosts to $HOSTS again"
-cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS again" 6
-log "truncating $HOSTS"
-> $HOSTS || fail "can't truncate $HOSTS" 8
-log "removing $HOSTS"
-rm $HOSTS || fail "can't remove $HOSTS" 9
-
-DST=$OSCMT/runtest.$$
+log "touching $MOUNT"
+touch $MOUNT || fail "can't touch $MOUNT" 2
+HOSTS=$MOUNT/hosts.$$
+
+if [ $COUNT -gt 10 -o $COUNT -eq 0 ]; then
+ # this will cause the following cp to trigger bug #620096
+ log "create an empty file $HOSTS"
+ mcreate $HOSTS
+ log "copying /etc/hosts to $HOSTS"
+ cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS" 3
+ log "comparing /etc/hosts and $HOSTS"
+ diff -u /etc/hosts $HOSTS || fail "$HOSTS different" 4
+ log "renaming $HOSTS to $HOSTS.ren"
+ mv $HOSTS $HOSTS.ren || fail "can't rename $HOSTS to $HOSTS.ren" 5
+ log "copying /etc/hosts to $HOSTS again"
+ cp /etc/hosts $HOSTS || fail "can't cp /etc/hosts to $HOSTS again" 6
+ log "truncating $HOSTS"
+ > $HOSTS || fail "can't truncate $HOSTS" 8
+ log "removing $HOSTS"
+ rm $HOSTS || fail "can't remove $HOSTS" 9
+fi
+
+DST=$MOUNT/runtest.$$
# let's start slowly here...
log "creating $DST"
mkdir $DST || fail "can't mkdir $DST" 10
# ok, that hopefully worked, so let's do a little more, with files that
# haven't changed in the last day (hopefully they don't change during test)
-FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -$COUNT`
+FILES=`find $SRC -type f -mtime +1 -ctime +1 | head -n $COUNT`
log "copying files from $SRC to $DST$SRC"
tar cf - $FILES | tar xvf - -C $DST || fail "copying $SRC" 11
[ "$ERROR" ] && fail "old and new files are different" $ERROR
sh llmountcleanup.sh || exit 19
-sh llrmount.sh || exit 20
+sh llrmount.sh $OPTS || exit 20
log "comparing previously copied files"
for f in $FILES; do
sh llmountcleanup.sh || exit 19
sh llrmount.sh || exit 20
-log "renaming $HOSTS.ren to $HOSTS"
-mv $HOSTS.ren $HOSTS || fail "can't rename $HOSTS.ren to $HOSTS" 32
-log "truncating $HOSTS"
-> $HOSTS || fail "can't truncate $HOSTS" 34
-log "removing $HOSTS"
-rm $HOSTS || fail "can't remove $HOSTS again" 36
log "removing $DST"
rm -r $V $DST || fail "can't remove $DST" 37
+if [ $COUNT -gt 10 -o $COUNT -eq 0 ]; then
+ log "renaming $HOSTS.ren to $HOSTS"
+ mv $HOSTS.ren $HOSTS || fail "can't rename $HOSTS.ren to $HOSTS" 32
+ log "truncating $HOSTS"
+ > $HOSTS || fail "can't truncate $HOSTS" 34
+ log "removing $HOSTS"
+ rm $HOSTS || fail "can't remove $HOSTS again" 36
+fi
+
# mkdirmany test (bug 589)
-log "running mkdirmany $OSCMT/base$$ 100"
-$MKDIRMANY $OSCMT/base$$ 100 || fail "mkdirmany failed"
+log "running mkdirmany $MOUNT/base$$ 100"
+$MKDIRMANY $MOUNT/base$$ 100 || fail "mkdirmany failed"
log "removing mkdirmany directories"
-rmdir $OSCMT/base$$* || fail "mkdirmany cleanup failed"
+rmdir $MOUNT/base$$* || fail "mkdirmany cleanup failed"
log "done"
-NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -1`
-if [ $NOWUSED -gt $USED ]; then
+NOWUSED=`df | awk "/$OSCTMP/ { print \\$3 }" | tail -n 1`
+if [ `expr $NOWUSED - $USED` -gt 1024 ]; then
echo "Space not all freed: now ${NOWUSED}kB, was ${USED}kB." 1>&2
- echo "This is normal on BA OSTs, because of subdirectories." 1>&2
fi
if [ "$I_MOUNTED" = "yes" ]; then