benchmark-terasort: parametrise jvm variant

And will also call stop-all.sh on exit.

Signed-off-by: Andrew McDermott <andrew.mcdermott@linaro.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/benchmark-terasort b/benchmark-terasort
index 730e473..6aa69f4 100755
--- a/benchmark-terasort
+++ b/benchmark-terasort
@@ -55,9 +55,11 @@ hadoop fs -copyFromLocal $THIS_BENCHMARK_DIR/${NGIGABYTES}GB /user/$USER
 
 mkdir -p $BENCHMARK_RESULTS_DIR
 
+trap "stop-all.sh" EXIT
+
 function benchmark_terasort() {
     local jvm_type=$1
-    local elapsed_time_file=/tmp/benchmark-$USER.$$
+    local elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
     HADOOP_OPTS=-${jvm_type} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
     hadoop fs -rm -R ${NGIGABYTES}GB-sorted
     sed -i 's/\..*//' $elapsed_time_file
@@ -66,8 +68,9 @@ function benchmark_terasort() {
     rm -f $elapsed_time_file
 }
 
-benchmark_terasort "server"
-benchmark_terasort "client"
+for i in "$@"; do
+    benchmark_terasort $i
+done
 
 stop-all.sh