Skip to content

SPARK-1286: Make usage of spark-env.sh idempotent #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aarondav wants to merge 3 commits into from
Closed

SPARK-1286: Make usage of spark-env.sh idempotent #184

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93a2471
SPARK-1286: Make usage of spark-env.sh idempotent
aarondav Mar 20, 2014
8da8360
Add .sh extension to load-spark-env.sh
aarondav Mar 20, 2014
e291f91
Use "private" variables in load-spark-env.sh
aarondav Mar 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use "private" variables in load-spark-env.sh
  • Loading branch information
@aarondav
aarondav committed Mar 23, 2014
commit e291f91a5d9d84679048134a33f171264832b24b
8 changes: 4 additions & 4 deletions bin/load-spark-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ if [ -z "$SPARK_ENV_LOADED" ]; then
export SPARK_ENV_LOADED=1

# Returns the parent of the directory this script lives in.
FWDIR="$(cd `dirname $0`/..; pwd)"
parent_dir="$(cd `dirname $0`/..; pwd)"

SPARK_CONF_DIR=${SPARK_CONF_DIR:-"$FWDIR/conf"}
use_conf_dir=${SPARK_CONF_DIR:-"$parent_dir/conf"}

if [ -f "${SPARK_CONF_DIR}/spark-env.sh" ]; then
. "${SPARK_CONF_DIR}/spark-env.sh"
if [ -f "${use_conf_dir}/spark-env.sh" ]; then
. "${use_conf_dir}/spark-env.sh"
fi
fi