X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Frundbench;h=ad938dae7b46dead4ef0220d76b79f8e6fbd898f;hp=e2fc0bf3213f3ec55ff899017d8ed6358d6472d4;hb=b4015a80d09b7181a28253ce83b4b6d62411afa7;hpb=52174b0ed956eca7d7cfb970b60465b76f1ea1eb

diff --git a/lustre/tests/rundbench b/lustre/tests/rundbench
index e2fc0bf..ad938da 100755
--- a/lustre/tests/rundbench
+++ b/lustre/tests/rundbench
@@ -1,16 +1,94 @@
 #!/bin/sh
+
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+. $LUSTRE/tests/test-framework.sh
+
+usage() {
+    echo "-C use chroot instead of cd"
+    echo "-D DIR - use 'DIR' as work directory"
+    echo
+    exit;
+}
+
+PATH=${DBENCH_LIB}:${PATH}
 MOUNT=${MOUNT:-/mnt/lustre}
 DIR=${DIR:-$MOUNT/`hostname`}
-#[ -e /proc/sys/lnet/debug ] && echo 0 > /proc/sys/lnet/debug 
+
+PREFIX="on"
+while getopts "CD:" opt $*; do
+	case $opt in
+		D) [ -d $OPTARG ] && DIR=$OPTARG ;;
+		C) CHROOT="yes" ;;
+		\?) usage ;;
+	esac
+done
+
 mkdir -p $DIR
 TGT=$DIR/client.txt
-SRC=${SRC:-/usr/share/dbench/client.txt}
-[ ! -s $TGT -a -s $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
-SRC=${SRC:-/usr/lib/dbench/client.txt}
-[ ! -s $TGT -a -s $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
-SRC=/usr/lib/dbench/client_plain.txt
-[ ! -s $TGT -a -s $SRC ] && echo "copying $SRC to $TGT" && cp $SRC $TGT
-[ ! -s $TGT ] && echo "$0: $TGT doesn't exist (SRC=$SRC)" && exit 1
+CLIENT_PREFIX="${DBENCH_LIB} /usr/share/dbench /usr/local/share /usr/lib/dbench"
+CLIENT_FILE="client.txt client_plain.txt dbench_client"
+if ! which dbench > /dev/null 2>&1 ; then
+    [ "$MISSING_DBENCH_OK" ] || { error "$0 : $(hostname) dbench is not installed !" && exit 3; }
+    skip_env "$0 : $(hostname) dbench is not installed"
+    exit 0
+fi
+CLIENT=""
+
+for prefix in $CLIENT_PREFIX; do
+	for file in $CLIENT_FILE; do
+		if [ -s "${prefix}/${file}" ]; then
+			CLIENT="${prefix}/${file}";
+			break;
+		fi
+	done
+	[ "x$CLIENT" != "x" ] && break;
+done
+
+if [ -n "$SRC" -a -s "$SRC" ]; then
+	CLIENT=${SRC}
+fi
+
+[ ! -s "$CLIENT" ] && \
+    skip_env "$0 : $(hostname) no client file found for dbench DBENCH_LIB=$DBENCH_LIB SRC=$SRC" && \
+        exit 0 
+
+[ ! -s "$TGT" ] && echo "copying $CLIENT to $TGT" && cp $CLIENT $TGT
+[ ! -s "$TGT" ] && \
+    echo "$0 : $(hostname) $TGT file doesn't exist after cp $CLIENT $TGT" && exit 1
+
+if [ "x$CHROOT" == "xyes" ]; then
+	echo "copying necessary libs to $DIR"
+	cp `which dbench` $DIR
+	LIBS71=$(ldd $DIR/dbench|sed -e 's/\t*//' -e 's/.*=> //' -e 's/ .*//' -e 's/^\///')
+	tar -C / -chf - $LIBS71 | tar -C $DIR -xvf -
+	if [ "${PIPESTATUS[*]}" != "0 0" ]; then
+		echo "can't copy libs $LIBS71 to $DIR"
+		rm -f $DIR/dbench
+		exit 1
+	fi
+	RUN="chroot $DIR"
+	PREFIX="in"
+	PATH=.:/:$PATH
+fi
+
+shift $((OPTIND - 1))
+
+trap '
+echo kill dbench main pid=$DBENCHPID
+kill $DBENCHPID
+rm -rf dbench $LIBS71 client.txt
+exit 0
+' TERM
+
 cd $DIR
-echo "running 'dbench $@' on $PWD at `date`"
-dbench -c client.txt $@
+echo "running 'dbench $@' $PREFIX $PWD at `date`"
+
+$RUN dbench -c client.txt $@ &
+DBENCHPID=$!
+echo "dbench PID=$DBENCHPID"
+wait $DBENCHPID
+RC=$?
+[ $RC -ne 0 ] && killall -9 dbench
+
+rm -rf dbench $LIBS71 client.txt
+exit $RC