diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-06 14:34:46 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-02-10 21:59:41 -0800 |
| commit | 05d2e94838d5b728df203d87708beaf3f4aa4c81 (patch) | |
| tree | e20e3be665e13fab837d973ba20e1700676582e6 /docs/configuration.md | |
| parent | 8c66c4996220e7ea77aa9e307a744635b9576e5e (diff) | |
| download | spark-05d2e94838d5b728df203d87708beaf3f4aa4c81.tar.gz spark-05d2e94838d5b728df203d87708beaf3f4aa4c81.tar.bz2 spark-05d2e94838d5b728df203d87708beaf3f4aa4c81.zip | |
Use a separate memory setting for standalone cluster daemons
Conflicts:
docs/_config.yml
Diffstat (limited to 'docs/configuration.md')
| -rw-r--r-- | docs/configuration.md | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/docs/configuration.md b/docs/configuration.md index a7054b4321..f1ca77aa78 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -198,6 +198,14 @@ Apart from these, the following properties are also available, and may be useful </td> </tr> <tr> + <td>spark.worker.timeout</td> + <td>60</td> + <td> + Number of seconds after which the standalone deploy master considers a worker lost if it + receives no heartbeats. + </td> +</tr> +<tr> <td>spark.akka.frameSize</td> <td>10</td> <td> @@ -218,7 +226,7 @@ Apart from these, the following properties are also available, and may be useful <td>spark.akka.timeout</td> <td>20</td> <td> - Communication timeout between Spark nodes. + Communication timeout between Spark nodes, in seconds. </td> </tr> <tr> |