Skip to content
Snippets Groups Projects
Commit 53f6bb1d authored by raschild's avatar raschild Committed by Sean Owen
Browse files

SPARK-4924 addendum. Minor assembly directory fix in load-spark-env-sh

Set the current dir path $FWDIR and same at $ASSEMBLY_DIR1, $ASSEMBLY_DIR2
otherwise $SPARK_HOME cannot be visible from spark-env.sh -- no SPARK_HOME variable is assigned there.
I am using the Spark-1.3.0 source code package and I come across with this when trying to start the master: sbin/start-master.sh

Author: raschild <raschild@users.noreply.github.com>

Closes #5261 from raschild/patch-1 and squashes the following commits:

b9babcd [raschild] Update load-spark-env.sh
parent b9c51c04
No related branches found
No related tags found
No related merge requests found
......@@ -20,6 +20,7 @@
# This script loads spark-env.sh if it exists, and ensures it is only loaded once.
# spark-env.sh is loaded from SPARK_CONF_DIR if set, or within the current directory's
# conf/ subdirectory.
FWDIR="$(cd "`dirname "$0"`"/..; pwd)"
if [ -z "$SPARK_ENV_LOADED" ]; then
export SPARK_ENV_LOADED=1
......@@ -41,8 +42,8 @@ fi
if [ -z "$SPARK_SCALA_VERSION" ]; then
ASSEMBLY_DIR2="$SPARK_HOME/assembly/target/scala-2.11"
ASSEMBLY_DIR1="$SPARK_HOME/assembly/target/scala-2.10"
ASSEMBLY_DIR2="$FWDIR/assembly/target/scala-2.11"
ASSEMBLY_DIR1="$FWDIR/assembly/target/scala-2.10"
if [[ -d "$ASSEMBLY_DIR2" && -d "$ASSEMBLY_DIR1" ]]; then
echo -e "Presence of build for both scala versions(SCALA 2.10 and SCALA 2.11) detected." 1>&2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment