diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/_config.yml | 2 | ||||
| -rw-r--r-- | docs/_plugins/copy_api_dirs.rb | 2 | ||||
| -rw-r--r-- | docs/configuration.md | 23 |
3 files changed, 24 insertions, 3 deletions
diff --git a/docs/_config.yml b/docs/_config.yml index 48ecb8d0c9..02067f9750 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -5,6 +5,6 @@ markdown: kramdown # of Spark, Scala, and Mesos. SPARK_VERSION: 0.9.0-incubating-SNAPSHOT SPARK_VERSION_SHORT: 0.9.0-SNAPSHOT -SCALA_VERSION: 2.9.3 +SCALA_VERSION: 2.10 MESOS_VERSION: 0.13.0 SPARK_ISSUE_TRACKER_URL: https://spark-project.atlassian.net diff --git a/docs/_plugins/copy_api_dirs.rb b/docs/_plugins/copy_api_dirs.rb index c574ea7f5c..431de909cb 100644 --- a/docs/_plugins/copy_api_dirs.rb +++ b/docs/_plugins/copy_api_dirs.rb @@ -35,7 +35,7 @@ if not (ENV['SKIP_API'] == '1' or ENV['SKIP_SCALADOC'] == '1') # Copy over the scaladoc from each project into the docs directory. # This directory will be copied over to _site when `jekyll` command is run. projects.each do |project_name| - source = "../" + project_name + "/target/scala-2.9.3/api" + source = "../" + project_name + "/target/scala-2.10/api" dest = "api/" + project_name puts "echo making directory " + dest diff --git a/docs/configuration.md b/docs/configuration.md index 62c4457a3e..8cca77e5c0 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -275,12 +275,33 @@ Apart from these, the following properties are also available, and may be useful </tr> <tr> <td>spark.akka.timeout</td> - <td>20</td> + <td>60</td> <td> Communication timeout between Spark nodes, in seconds. </td> </tr> <tr> + <td>spark.akka.heartbeat.pauses</td> + <td>60</td> + <td> + Acceptable heart beat pause in seconds for akka, tune this if you expect GC pauses or network delays (reconnections) etc. + </td> +</tr> +<tr> + <td>spark.akka.failure-detector.threshold</td> + <td>12.0</td> + <td> + Tuning this is not recommended unless you are sure what you are doing. This maps to akka's `akka.remote.transport-failure-detector.threshold`. Usually having a larger value of `spark.akka.pauses` should suffice. + </td> +</tr> +<tr> + <td>spark.akka.heartbeat.interval</td> + <td>5</td> + <td> + A larger interval value in seconds reduces network overhead and a smaller value might be more informative for akka's failure detector. Tune this in combination of `spark.akka.heartbeat.pauses` and `spark.akka.failure-detector.threshold` if you need to. + </td> +</tr> +<tr> <td>spark.driver.host</td> <td>(local hostname)</td> <td> |