diff --git hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh index fc41f7f..add866c 100644 --- hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh +++ hadoop-common-project/hadoop-common/src/main/bin/hadoop-config.sh @@ -247,6 +247,7 @@ fi # setup a default TOOL_PATH TOOL_PATH="${TOOL_PATH:-$HADOOP_PREFIX/share/hadoop/tools/lib/*}" +SLS_PATH="${SLS_PATH:-$HADOOP_PREFIX/share/hadoop/tools/sls}" HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.dir=$HADOOP_LOG_DIR" HADOOP_OPTS="$HADOOP_OPTS -Dhadoop.log.file=$HADOOP_LOGFILE" diff --git hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh index 1e402df..60e3929 100644 --- hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh +++ hadoop-tools/hadoop-sls/src/main/bin/slsrun.sh @@ -77,7 +77,7 @@ calculateClasspath() { DEFAULT_LIBEXEC_DIR=${HADOOP_BASE}/../libexec HADOOP_LIBEXEC_DIR=${HADOOP_LIBEXEC_DIR:-$DEFAULT_LIBEXEC_DIR} . $HADOOP_LIBEXEC_DIR/hadoop-config.sh - export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${TOOL_PATH}:html" + export HADOOP_CLASSPATH="${HADOOP_CLASSPATH}:${TOOL_PATH}:${SLS_PATH}/html" } ############################################################################### runSimulation() {