2013-09-01 21:19:29 -04:00
|
|
|
@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 Figure out where the Spark framework is installed
|
[SPARK-22495] Fix setup of SPARK_HOME variable on Windows
## What changes were proposed in this pull request?
Fixing the way how `SPARK_HOME` is resolved on Windows. While the previous version was working with the built release download, the set of directories changed slightly for the PySpark `pip` or `conda` install. This has been reflected in Linux files in `bin` but not for Windows `cmd` files.
First fix improves the way how the `jars` directory is found, as this was stoping Windows version of `pip/conda` install from working; JARs were not found by on Session/Context setup.
Second fix is adding `find-spark-home.cmd` script, which uses `find_spark_home.py` script, as the Linux version, to resolve `SPARK_HOME`. It is based on `find-spark-home` bash script, though, some operations are done in different order due to the `cmd` script language limitations. If environment variable is set, the Python script `find_spark_home.py` will not be run. The process can fail if Python is not installed, but it will mostly use this way if PySpark is installed via `pip/conda`, thus, there is some Python in the system.
## How was this patch tested?
Tested on local installation.
Author: Jakub Nowacki <j.s.nowacki@gmail.com>
Closes #19370 from jsnowacki/fix_spark_cmds.
2017-11-22 22:47:38 -05:00
|
|
|
call "%~dp0find-spark-home.cmd"
|
2013-09-01 21:19:29 -04:00
|
|
|
|
2016-02-10 04:54:22 -05:00
|
|
|
call "%SPARK_HOME%\bin\load-spark-env.cmd"
|
2015-06-05 08:32:00 -04:00
|
|
|
set _SPARK_CMD_USAGE=Usage: bin\pyspark.cmd [options]
|
2013-09-01 21:19:29 -04:00
|
|
|
|
|
|
|
|
rem Figure out which Python to use.
|
2015-03-11 04:03:01 -04:00
|
|
|
if "x%PYSPARK_DRIVER_PYTHON%"=="x" (
|
|
|
|
|
set PYSPARK_DRIVER_PYTHON=python
|
|
|
|
|
if not [%PYSPARK_PYTHON%] == [] set PYSPARK_DRIVER_PYTHON=%PYSPARK_PYTHON%
|
|
|
|
|
)
|
2013-09-01 21:19:29 -04:00
|
|
|
|
2015-03-11 04:03:01 -04:00
|
|
|
set PYTHONPATH=%SPARK_HOME%\python;%PYTHONPATH%
|
2021-01-04 13:23:38 -05:00
|
|
|
set PYTHONPATH=%SPARK_HOME%\python\lib\py4j-0.10.9.1-src.zip;%PYTHONPATH%
|
2013-09-01 21:19:29 -04:00
|
|
|
|
|
|
|
|
set OLD_PYTHONSTARTUP=%PYTHONSTARTUP%
|
2015-03-11 04:03:01 -04:00
|
|
|
set PYTHONSTARTUP=%SPARK_HOME%\python\pyspark\shell.py
|
[SPARK-1808] Route bin/pyspark through Spark submit
**Problem.** For `bin/pyspark`, there is currently no other way to specify Spark configuration properties other than through `SPARK_JAVA_OPTS` in `conf/spark-env.sh`. However, this mechanism is supposedly deprecated. Instead, it needs to pick up configurations explicitly specified in `conf/spark-defaults.conf`.
**Solution.** Have `bin/pyspark` invoke `bin/spark-submit`, like all of its counterparts in Scala land (i.e. `bin/spark-shell`, `bin/run-example`). This has the additional benefit of making the invocation of all the user facing Spark scripts consistent.
**Details.** `bin/pyspark` inherently handles two cases: (1) running python applications and (2) running the python shell. For (1), Spark submit already handles running python applications. For cases in which `bin/pyspark` is given a python file, we can simply call pass the file directly to Spark submit and let it handle the rest.
For case (2), `bin/pyspark` starts a python process as before, which launches the JVM as a sub-process. The existing code already provides a code path to do this. All we needed to change is to use `bin/spark-submit` instead of `spark-class` to launch the JVM. This requires modifications to Spark submit to handle the pyspark shell as a special case.
This has been tested locally (OSX and Windows 7), on a standalone cluster, and on a YARN cluster. Running IPython also works as before, except now it takes in Spark submit arguments too.
Author: Andrew Or <andrewor14@gmail.com>
Closes #799 from andrewor14/pyspark-submit and squashes the following commits:
bf37e36 [Andrew Or] Minor changes
01066fa [Andrew Or] bin/pyspark for Windows
c8cb3bf [Andrew Or] Handle perverse app names (with escaped quotes)
1866f85 [Andrew Or] Windows is not cooperating
456d844 [Andrew Or] Guard against shlex hanging if PYSPARK_SUBMIT_ARGS is not set
7eebda8 [Andrew Or] Merge branch 'master' of github.com:apache/spark into pyspark-submit
b7ba0d8 [Andrew Or] Address a few comments (minor)
06eb138 [Andrew Or] Use shlex instead of writing our own parser
05879fa [Andrew Or] Merge branch 'master' of github.com:apache/spark into pyspark-submit
a823661 [Andrew Or] Fix --die-on-broken-pipe not propagated properly
6fba412 [Andrew Or] Deal with quotes + address various comments
fe4c8a7 [Andrew Or] Update --help for bin/pyspark
afe47bf [Andrew Or] Fix spark shell
f04aaa4 [Andrew Or] Merge branch 'master' of github.com:apache/spark into pyspark-submit
a371d26 [Andrew Or] Route bin/pyspark through Spark submit
2014-05-17 01:34:38 -04:00
|
|
|
|
2016-02-10 04:54:22 -05:00
|
|
|
call "%SPARK_HOME%\bin\spark-submit2.cmd" pyspark-shell-main --name "PySparkShell" %*
|
