Skip to content

[SPARK-32227] Fix regression bug in load-spark-env.cmd with Spark 3.0.0 #29044

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
warrenzhu25 wants to merge 2 commits into from
Closed

[SPARK-32227] Fix regression bug in load-spark-env.cmd with Spark 3.0.0 #29044

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d98751
[SPARK-32227] Fix regression bug in load-spark-env.cmd with Spark 3.0.0
Jul 8, 2020
4589e1b
Trigger Build
warrenzhu25 Jul 27, 2020
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
11 changes: 6 additions & 5 deletions bin/load-spark-env.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,14 @@ rem This script loads spark-env.cmd if it exists, and ensures it is only loaded
rem spark-env.cmd is loaded from SPARK_CONF_DIR if set, or within the current directory's
rem conf\ subdirectory.

set SPARK_ENV_CMD=spark-env.cmd
if not defined SPARK_ENV_LOADED (
set SPARK_ENV_LOADED=1

if [%SPARK_CONF_DIR%] == [] (
set SPARK_CONF_DIR=%~dp0..\conf
)

set SPARK_ENV_CMD=%SPARK_CONF_DIR%\%SPARK_ENV_CMD%
if exist %SPARK_ENV_CMD% (
call %SPARK_ENV_CMD%
)
call :LoadSparkEnv
)

rem Setting SPARK_SCALA_VERSION if not already set.
Expand All @@ -59,3 +55,8 @@ if not defined SPARK_SCALA_VERSION (
)
)
exit /b 0

:LoadSparkEnv
if exist "%SPARK_CONF_DIR%\spark-env.cmd" (
call "%SPARK_CONF_DIR%\spark-env.cmd"
)