diff options
| author | Nick Pentreath <nick.pentreath@gmail.com> | 2013-02-21 09:33:08 +0200 |
|---|---|---|
| committer | Nick Pentreath <nick.pentreath@gmail.com> | 2013-02-21 09:33:08 +0200 |
| commit | 16d456742e596cdf5ac870d44ea2b4f308ddebdc (patch) | |
| tree | a0989a98143f53ecaae0e9ffa4d01dc306f1f7fa /docs/configuration.md | |
| parent | 8a281399f970db761ea05baf07972fff1c5bd058 (diff) | |
| parent | 2921fa7d81be201e5d694ab58ade6233f397eef9 (diff) | |
| download | spark-16d456742e596cdf5ac870d44ea2b4f308ddebdc.tar.gz spark-16d456742e596cdf5ac870d44ea2b4f308ddebdc.tar.bz2 spark-16d456742e596cdf5ac870d44ea2b4f308ddebdc.zip | |
Merge remote-tracking branch 'upstream/streaming' into streaming-eg-algebird
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> |