From: fsgqa <fsgqa>
Date: Thu, 7 Nov 2002 05:42:19 +0000 (+0000)
Subject: Crank up dbench, now that everything seems to be quite stable under load.
X-Git-Tag: v1.1.0~1037
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3a4a860cbc7409b90aa3f023ee53694c58a23b21;p=users%2Fhch%2Fxfstests-dev.git

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.
---

diff --git a/bench b/bench
index bbcfcb656..cd7bc37df 100755
--- a/bench
+++ b/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
 }
 
diff --git a/common.dbench b/common.dbench
new file mode 100755
index 000000000..d5fabb1af
--- /dev/null
+++ b/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 }'
diff --git a/run.dbench b/run.dbench
index d5fabb1af..2ded1f290 100755
--- a/run.dbench
+++ b/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
diff --git a/run.dbench10 b/run.dbench10
new file mode 100755
index 000000000..5694fe3d6
--- /dev/null
+++ b/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
diff --git a/run.dbench100 b/run.dbench100
new file mode 100755
index 000000000..a69aa3c69
--- /dev/null
+++ b/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
diff --git a/run.dbench50 b/run.dbench50
new file mode 100755
index 000000000..c410436e1
--- /dev/null
+++ b/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