diff options
| author | Aaron Davidson <aaron@databricks.com> | 2014-04-07 13:06:30 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-04-07 13:06:30 -0700 |
| commit | 0307db0f55b714930c7ea118d5451190ea8c1a94 (patch) | |
| tree | aef07717fd1658760a51d77d2b22445bbfe9921e /python | |
| parent | 2a2ca48be61ed0d72c4347e1c042a264b94db3e8 (diff) | |
| download | spark-0307db0f55b714930c7ea118d5451190ea8c1a94.tar.gz spark-0307db0f55b714930c7ea118d5451190ea8c1a94.tar.bz2 spark-0307db0f55b714930c7ea118d5451190ea8c1a94.zip | |
SPARK-1099: Introduce local[*] mode to infer number of cores
This is the default mode for running spark-shell and pyspark, intended to allow users running spark for the first time to see the performance benefits of using multiple cores, while not breaking backwards compatibility for users who use "local" mode and expect exactly 1 core.
Author: Aaron Davidson <aaron@databricks.com>
Closes #182 from aarondav/110 and squashes the following commits:
a88294c [Aaron Davidson] Rebased changes for new spark-shell
a9f393e [Aaron Davidson] SPARK-1099: Introduce local[*] mode to infer number of cores
Diffstat (limited to 'python')
| -rw-r--r-- | python/pyspark/shell.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/pyspark/shell.py b/python/pyspark/shell.py index 3d779faf1f..35e48276e3 100644 --- a/python/pyspark/shell.py +++ b/python/pyspark/shell.py @@ -29,7 +29,7 @@ from pyspark.storagelevel import StorageLevel # this is the equivalent of ADD_JARS add_files = os.environ.get("ADD_FILES").split(',') if os.environ.get("ADD_FILES") != None else None -sc = SparkContext(os.environ.get("MASTER", "local"), "PySparkShell", pyFiles=add_files) +sc = SparkContext(os.environ.get("MASTER", "local[*]"), "PySparkShell", pyFiles=add_files) print """Welcome to ____ __ |