Crank up dbench, now that everything seems to be quite stable under load.

We now do 1, 10, 50, and 100 client runs each night.
Make sure the path back to the scripts directory is available in the
environment for scripts to get at if need be.

bench

@@ -50,7 +50,7 @@
 owner=nathans@sgi.com
 
 tmp=/tmp/$$
-here=`pwd`
+here=`pwd`; export here
 status=1	# failure is the default!
 
 # get standard environment, filters and checks
@@ -134,7 +134,7 @@ _run_benchmark()
 _merge_results()
 {
     echo Results for $bench benchmark >>$OUT
-    echo results.$bench.* | sort -u | xargs cat >>$OUT
+    echo results.$bench.* | sort -nu | xargs cat >>$OUT
     echo >>$OUT
 }
 

common.dbench

@@ -0,0 +1,27 @@
+#!/bin/sh
+# 
+# Does a dbench run (10 clients if $DBENCH_CLIENTS is not set),
+# then massages the output into CSV format.
+# 
+DBENCH_CLIENTS=${DBENCH_CLIENTS:=10}
+
+run_dbench()
+{
+	mkdir ./dbench || exit 1
+	cd dbench
+	dbench $DBENCH_CLIENTS
+	status=$?
+	cd ..
+	rm -fr ./dbench
+	[ $status -ne 0 ] && exit 1
+}
+
+# 
+# Sample dbench output:
+# "Throughput 40.6701 MB/sec (NB=50.8376 MB/sec  406.701 MBit/sec)"
+# 
+if [ $# -gt 0 ]; then
+	echo "clients,MB/sec"
+	exit 0
+fi
+run_dbench | awk 'END { printf "%u,%s\n", '$DBENCH_CLIENTS', $2 }'

run.dbench

@@ -1,27 +1,8 @@
 #!/bin/sh
 # 
-# Does a dbench run (10 clients if $DBENCH_CLIENTS is not set),
-# then massages the output into CSV format.
+# Does a single-client dbench run
 # 
-DBENCH_CLIENTS=${DBENCH_CLIENTS:=10}
+DBENCH_CLIENTS=1
+export DBENCH_CLIENTS
 
-run_dbench()
-{
-	mkdir ./dbench || exit 1
-	cd dbench
-	dbench $DBENCH_CLIENTS
-	status=$?
-	cd ..
-	rm -fr ./dbench
-	[ $status -ne 0 ] && exit 1
-}
-
-# 
-# Sample dbench output:
-# "Throughput 40.6701 MB/sec (NB=50.8376 MB/sec  406.701 MBit/sec)"
-# 
-if [ $# -gt 0 ]; then
-	echo "clients,MB/sec"
-	exit 0
-fi
-run_dbench | awk 'END { printf "%u,%s\n", '$DBENCH_CLIENTS', $2 }'
+exec $here/common.dbench

run.dbench10

@@ -0,0 +1,8 @@
+#!/bin/sh
+# 
+# Does a dbench run with 10 clients
+# 
+DBENCH_CLIENTS=10
+export DBENCH_CLIENTS
+
+exec $here/common.dbench

run.dbench100

@@ -0,0 +1,8 @@
+#!/bin/sh
+# 
+# Does a dbench run with 100 clients
+# 
+DBENCH_CLIENTS=100
+export DBENCH_CLIENTS
+
+exec $here/common.dbench

run.dbench50

@@ -0,0 +1,8 @@
+#!/bin/sh
+# 
+# Does a dbench run with 50 clients
+# 
+DBENCH_CLIENTS=50
+export DBENCH_CLIENTS
+
+exec $here/common.dbench