Skip to content

Commit

Permalink
Update load-spark-env.sh
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Raschild committed Mar 30, 2015
1 parent 17b13c5 commit b9babcd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions bin/load-spark-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit b9babcd

Please sign in to comment.