From b3329a961b1ed6bc05969a88743238a552e2b507 Mon Sep 17 00:00:00 2001 From: Noah Watkins Date: Tue, 24 Feb 2015 18:26:44 -0800 Subject: [PATCH] hadoop: workunits don't need java path Signed-off-by: Noah Watkins --- qa/workunits/hadoop/repl.sh | 2 -- qa/workunits/hadoop/terasort.sh | 2 -- qa/workunits/hadoop/wordcount.sh | 2 -- 3 files changed, 6 deletions(-) diff --git a/qa/workunits/hadoop/repl.sh b/qa/workunits/hadoop/repl.sh index 2284cce0003e..f2e9fccbd308 100755 --- a/qa/workunits/hadoop/repl.sh +++ b/qa/workunits/hadoop/repl.sh @@ -9,8 +9,6 @@ set -x # if HADOOP_PREFIX is not set, use default [ -z $HADOOP_PREFIX ] && { HADOOP_PREFIX=$TESTDIR/hadoop; } -export JAVA_HOME=/usr/lib/jvm/default-java - # create pools with different replication factors for repl in 2 3 7 8 9; do name=hadoop.$repl diff --git a/qa/workunits/hadoop/terasort.sh b/qa/workunits/hadoop/terasort.sh index f3a7b7017a12..7996aece7ea4 100755 --- a/qa/workunits/hadoop/terasort.sh +++ b/qa/workunits/hadoop/terasort.sh @@ -16,8 +16,6 @@ num_records=100000 # if HADOOP_PREFIX is not set, use default [ -z $HADOOP_PREFIX ] && { HADOOP_PREFIX=$TESTDIR/hadoop; } -export JAVA_HOME=/usr/lib/jvm/default-java - # Nuke hadoop directories $HADOOP_PREFIX/bin/hadoop fs -rm -r $INPUT $OUTPUT $REPORT || true diff --git a/qa/workunits/hadoop/wordcount.sh b/qa/workunits/hadoop/wordcount.sh index da91929fcdc7..99e1e8ff8974 100755 --- a/qa/workunits/hadoop/wordcount.sh +++ b/qa/workunits/hadoop/wordcount.sh @@ -15,8 +15,6 @@ echo "starting hadoop-wordcount test" # if HADOOP_PREFIX is not set, use default [ -z $HADOOP_PREFIX ] && { HADOOP_PREFIX=$TESTDIR/hadoop; } -export JAVA_HOME=/usr/lib/jvm/default-java - # Nuke hadoop directories $HADOOP_PREFIX/bin/hadoop fs -rm -r $WC_INPUT $WC_OUTPUT || true -- 2.47.3