diff options
| author | Sandy Ryza <sandy@cloudera.com> | 2014-04-29 23:24:34 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-29 23:24:54 -0700 |
| commit | 177361c54f325fc5b6d469dffda79ace2b08a287 (patch) | |
| tree | a2554eb316feda674ce9bc916bd9b5b4a05a5d46 /bin/pyspark | |
| parent | b0ded1f6f23f326b6b7a8d3b118cd03a5476655a (diff) | |
| download | spark-177361c54f325fc5b6d469dffda79ace2b08a287.tar.gz spark-177361c54f325fc5b6d469dffda79ace2b08a287.tar.bz2 spark-177361c54f325fc5b6d469dffda79ace2b08a287.zip | |
SPARK-1004. PySpark on YARN
This reopens https://github.com/apache/incubator-spark/pull/640 against the new repo
Author: Sandy Ryza <sandy@cloudera.com>
Closes #30 from sryza/sandy-spark-1004 and squashes the following commits:
89889d4 [Sandy Ryza] Move unzipping py4j to the generate-resources phase so that it gets included in the jar the first time
5165a02 [Sandy Ryza] Fix docs
fd0df79 [Sandy Ryza] PySpark on YARN
(cherry picked from commit ff5be9a41e52454e0f9cae83dd1fd50fbeaa684a)
Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'bin/pyspark')
| -rwxr-xr-x | bin/pyspark | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/bin/pyspark b/bin/pyspark index cad982bc33..f5558853e8 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -46,6 +46,7 @@ export PYSPARK_PYTHON # Add the PySpark classes to the Python path: export PYTHONPATH=$SPARK_HOME/python/:$PYTHONPATH +export PYTHONPATH=$SPARK_HOME/python/lib/py4j-0.8.1-src.zip:$PYTHONPATH # Load the PySpark shell.py script when ./pyspark is used interactively: export OLD_PYTHONSTARTUP=$PYTHONSTARTUP |