diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2014-07-03 15:06:58 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-07-03 15:06:58 -0700 |
| commit | 731f683b1bd8abbb83030b6bae14876658bbf098 (patch) | |
| tree | 729c971a4dd31818da07b8cec4d69d7d7fa9104d /bin/pyspark | |
| parent | a9b52e5623f7fc77fca96b095f9eeaef76e35d54 (diff) | |
| download | spark-731f683b1bd8abbb83030b6bae14876658bbf098.tar.gz spark-731f683b1bd8abbb83030b6bae14876658bbf098.tar.bz2 spark-731f683b1bd8abbb83030b6bae14876658bbf098.zip | |
[SPARK-2109] Setting SPARK_MEM for bin/pyspark does not work.
Trivial fix.
Author: Prashant Sharma <prashant.s@imaginea.com>
Closes #1050 from ScrapCodes/SPARK-2109/pyspark-script-bug and squashes the following commits:
77072b9 [Prashant Sharma] Changed echos to redirect to STDERR.
13f48a0 [Prashant Sharma] [SPARK-2109] Setting SPARK_MEM for bin/pyspark does not work.
Diffstat (limited to 'bin/pyspark')
| -rwxr-xr-x | bin/pyspark | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/pyspark b/bin/pyspark index 0b5ed40e21..69b056fe28 100755 --- a/bin/pyspark +++ b/bin/pyspark @@ -26,7 +26,7 @@ export SPARK_HOME="$FWDIR" SCALA_VERSION=2.10 if [[ "$@" = *--help ]] || [[ "$@" = *-h ]]; then - echo "Usage: ./bin/pyspark [options]" + echo "Usage: ./bin/pyspark [options]" 1>&2 $FWDIR/bin/spark-submit --help 2>&1 | grep -v Usage 1>&2 exit 0 fi @@ -36,8 +36,8 @@ if [ ! -f "$FWDIR/RELEASE" ]; then # Exit if the user hasn't compiled Spark ls "$FWDIR"/assembly/target/scala-$SCALA_VERSION/spark-assembly*hadoop*.jar >& /dev/null if [[ $? != 0 ]]; then - echo "Failed to find Spark assembly in $FWDIR/assembly/target" >&2 - echo "You need to build Spark before running this program" >&2 + echo "Failed to find Spark assembly in $FWDIR/assembly/target" 1>&2 + echo "You need to build Spark before running this program" 1>&2 exit 1 fi fi |