-
Notifications
You must be signed in to change notification settings - Fork 29k
[SPARK-3943] Some scripts bin\*.cmd pollutes environment variables in Windows #2797
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.
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
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| @echo off | ||
|
|
||
| rem | ||
| rem Licensed to the Apache Software Foundation (ASF) under one or more | ||
| rem contributor license agreements. See the NOTICE file distributed with | ||
| rem this work for additional information regarding copyright ownership. | ||
| rem The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| rem (the "License"); you may not use this file except in compliance with | ||
| rem the License. You may obtain a copy of the License at | ||
| rem | ||
| rem http://www.apache.org/licenses/LICENSE-2.0 | ||
| rem | ||
| rem Unless required by applicable law or agreed to in writing, software | ||
| rem distributed under the License is distributed on an "AS IS" BASIS, | ||
| rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| rem See the License for the specific language governing permissions and | ||
| rem limitations under the License. | ||
| rem | ||
|
|
||
| set SPARK_HOME=%~dp0.. | ||
|
|
||
| cmd /V /E /C %SPARK_HOME%\bin\spark-submit.cmd --class org.apache.spark.repl.Main %* spark-shell | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| @echo off | ||
|
|
||
| rem | ||
| rem Licensed to the Apache Software Foundation (ASF) under one or more | ||
| rem contributor license agreements. See the NOTICE file distributed with | ||
| rem this work for additional information regarding copyright ownership. | ||
| rem The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| rem (the "License"); you may not use this file except in compliance with | ||
| rem the License. You may obtain a copy of the License at | ||
| rem | ||
| rem http://www.apache.org/licenses/LICENSE-2.0 | ||
| rem | ||
| rem Unless required by applicable law or agreed to in writing, software | ||
| rem distributed under the License is distributed on an "AS IS" BASIS, | ||
| rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| rem See the License for the specific language governing permissions and | ||
| rem limitations under the License. | ||
| rem | ||
|
|
||
| rem NOTE: Any changes in this file must be reflected in SparkSubmitDriverBootstrapper.scala! | ||
|
|
||
| set SPARK_HOME=%~dp0.. | ||
| set ORIG_ARGS=%* | ||
|
|
||
| rem Reset the values of all variables used | ||
| set SPARK_SUBMIT_DEPLOY_MODE=client | ||
| set SPARK_SUBMIT_PROPERTIES_FILE=%SPARK_HOME%\conf\spark-defaults.conf | ||
| set SPARK_SUBMIT_DRIVER_MEMORY= | ||
| set SPARK_SUBMIT_LIBRARY_PATH= | ||
| set SPARK_SUBMIT_CLASSPATH= | ||
| set SPARK_SUBMIT_OPTS= | ||
| set SPARK_SUBMIT_BOOTSTRAP_DRIVER= | ||
|
|
||
| :loop | ||
| if [%1] == [] goto continue | ||
| if [%1] == [--deploy-mode] ( | ||
| set SPARK_SUBMIT_DEPLOY_MODE=%2 | ||
| ) else if [%1] == [--properties-file] ( | ||
| set SPARK_SUBMIT_PROPERTIES_FILE=%2 | ||
| ) else if [%1] == [--driver-memory] ( | ||
| set SPARK_SUBMIT_DRIVER_MEMORY=%2 | ||
| ) else if [%1] == [--driver-library-path] ( | ||
| set SPARK_SUBMIT_LIBRARY_PATH=%2 | ||
| ) else if [%1] == [--driver-class-path] ( | ||
| set SPARK_SUBMIT_CLASSPATH=%2 | ||
| ) else if [%1] == [--driver-java-options] ( | ||
| set SPARK_SUBMIT_OPTS=%2 | ||
| ) | ||
| shift | ||
| goto loop | ||
| :continue | ||
|
|
||
| rem For client mode, the driver will be launched in the same JVM that launches | ||
| rem SparkSubmit, so we may need to read the properties file for any extra class | ||
| rem paths, library paths, java options and memory early on. Otherwise, it will | ||
| rem be too late by the time the driver JVM has started. | ||
|
|
||
| if [%SPARK_SUBMIT_DEPLOY_MODE%] == [client] ( | ||
| if exist %SPARK_SUBMIT_PROPERTIES_FILE% ( | ||
| rem Parse the properties file only if the special configs exist | ||
| for /f %%i in ('findstr /r /c:"^[\t ]*spark.driver.memory" /c:"^[\t ]*spark.driver.extra" ^ | ||
| %SPARK_SUBMIT_PROPERTIES_FILE%') do ( | ||
| set SPARK_SUBMIT_BOOTSTRAP_DRIVER=1 | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| cmd /V /E /C %SPARK_HOME%\bin\spark-class.cmd org.apache.spark.deploy.SparkSubmit %ORIG_ARGS% |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| *.pyc | ||
| docs/ | ||
| docs/_build/ | ||
| pyspark.egg-info | ||
| build/ | ||
| dist/ |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the purpose of this file such that exporting
SPARK_HOMEhere doesn't keep it in the system environment even after the application exits?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it is.
Although this script now has only one environment variable
SPARK_HOME, it might be more complicated in future just like bin/spark-shell (linux version), then it might export other environment variables.