diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-30 15:38:58 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-06-30 15:46:46 -0700 |
| commit | 03d0b858c807339b4221bedffa29ac76eef5352e (patch) | |
| tree | 3235e3d155dfc6eb0b55a36046492f653ab41346 /docs/ec2-scripts.md | |
| parent | ccfe953a4db25c920157554a2cd820f8afb41ca3 (diff) | |
| download | spark-03d0b858c807339b4221bedffa29ac76eef5352e.tar.gz spark-03d0b858c807339b4221bedffa29ac76eef5352e.tar.bz2 spark-03d0b858c807339b4221bedffa29ac76eef5352e.zip | |
Made use of spark.executor.memory setting consistent and documented it
Conflicts:
core/src/main/scala/spark/SparkContext.scala
Diffstat (limited to 'docs/ec2-scripts.md')
| -rw-r--r-- | docs/ec2-scripts.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/ec2-scripts.md b/docs/ec2-scripts.md index dc57035eba..eab8a0ff20 100644 --- a/docs/ec2-scripts.md +++ b/docs/ec2-scripts.md @@ -106,9 +106,8 @@ permissions on your private key file, you can run `launch` with the # Configuration You can edit `/root/spark/conf/spark-env.sh` on each machine to set Spark configuration options, such -as JVM options and, most crucially, the amount of memory to use per machine (`SPARK_MEM`). -This file needs to be copied to **every machine** to reflect the change. The easiest way to do this -is to use a script we provide called `copy-dir`. First edit your `spark-env.sh` file on the master, +as JVM options. This file needs to be copied to **every machine** to reflect the change. The easiest way to +do this is to use a script we provide called `copy-dir`. First edit your `spark-env.sh` file on the master, then run `~/spark-ec2/copy-dir /root/spark/conf` to RSYNC it to all the workers. The [configuration guide](configuration.html) describes the available configuration options. |