[GitHub] milleruntime closed pull request #6: ACCUMULO-4718 Add CLASSPATH to accumulo-testing script

[gi...@git.apache.org]

milleruntime closed pull request #6: ACCUMULO-4718 Add CLASSPATH to accumulo-testing script
URL: https://github.com/apache/accumulo-testing/pull/6
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/bin/accumulo-testing b/bin/accumulo-testing
index 84a1d40..3412564 100755
--- a/bin/accumulo-testing
+++ b/bin/accumulo-testing
@@ -70,6 +70,7 @@ fi
 
 function build_shade_jar() {
   export at_shaded_jar="$at_home/core/target/accumulo-testing-core-$at_version-shaded.jar"
+  export CLASSPATH="$at_shaded_jar:$CLASSPATH"
   if [ ! -f "$at_shaded_jar" ]; then
     echo "Building $at_shaded_jar"
     cd "$at_home" || exit 1
@@ -185,7 +186,7 @@ randomwalk_main="org.apache.accumulo.testing.core.randomwalk.Framework"
 case "$1" in
 ci-createtable)
   build_shade_jar
-  java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" org.apache.accumulo.testing.core.continuous.CreateTable "$at_props"
+  java -Dlog4j.configuration="file:$log4j_config" org.apache.accumulo.testing.core.continuous.CreateTable "$at_props"
   ;;
 ci-local)
   if [ -z "$2" ]; then
@@ -195,7 +196,7 @@ ci-local)
   fi
   determine_app_main "$2"
   build_shade_jar
-  java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" "$ci_main" "$at_props"
+  java -Dlog4j.configuration="file:$log4j_config" "$ci_main" "$at_props"
   ;;
 ci-yarn)
   if [ -z "$2" ]; then
@@ -229,7 +230,7 @@ rw-local)
     exit 1
   fi
   build_shade_jar
-  java -Dlog4j.configuration="file:$log4j_config" -cp "$at_shaded_jar" "$randomwalk_main" "$at_props" "$2"
+  java -Dlog4j.configuration="file:$log4j_config" "$randomwalk_main" "$at_props" "$2"
   ;;
 rw-yarn)
   if [ -z "$2" ]; then
diff --git a/conf/accumulo-testing-env.sh.example b/conf/accumulo-testing-env.sh.example
index e03c973..677c23d 100644
--- a/conf/accumulo-testing-env.sh.example
+++ b/conf/accumulo-testing-env.sh.example
@@ -20,6 +20,8 @@ test -z "$HADOOP_PREFIX" && export HADOOP_PREFIX=/path/to/hadoop
 export ACCUMULO_VERSION=`accumulo version`
 export HADOOP_VERSION=`hadoop version | head -n1 | awk '{print $2}'`
 export ZOOKEEPER_VERSION=3.4.9
+# Make sure Hadoop configuration directory is on the classpath
+export CLASSPATH=$HADOOP_PREFIX/etc/hadoop
 
 # Agitator
 # ========


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services