Skip to content

Commit

Permalink
SPARK-4924 addendum. Minor assembly directory fix in 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

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
  • Loading branch information
Raschild authored and srowen committed Apr 15, 2015
1 parent 2954a1e commit ec0e817
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 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 Down

0 comments on commit ec0e817

Please sign in to comment.