diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-11-25 18:10:54 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-11-25 18:10:54 +0530 |
| commit | 44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd (patch) | |
| tree | cd670cf460d106b5c5241d26aee4b35ccb6242aa /docs | |
| parent | 489862a65766d30278c186d280c6286937c81155 (diff) | |
| parent | 62889c419cfddb1cea2d260e9b530349d9f8eeda (diff) | |
| download | spark-44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd.tar.gz spark-44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd.tar.bz2 spark-44fd30d3fbcf830deecbe8ea3e8ea165e74e6edd.zip | |
Merge branch 'master' into scala-2.10-wip
Conflicts:
core/src/main/scala/org/apache/spark/rdd/RDD.scala
project/SparkBuild.scala
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/monitoring.md | 1 | ||||
| -rw-r--r-- | docs/tuning.md | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/docs/monitoring.md b/docs/monitoring.md index 5f456b999b..5ed0474477 100644 --- a/docs/monitoring.md +++ b/docs/monitoring.md @@ -50,6 +50,7 @@ Each instance can report to zero or more _sinks_. Sinks are contained in the * `GangliaSink`: Sends metrics to a Ganglia node or multicast group. * `JmxSink`: Registers metrics for viewing in a JXM console. * `MetricsServlet`: Adds a servlet within the existing Spark UI to serve metrics data as JSON data. +* `GraphiteSink`: Sends metrics to a Graphite node. The syntax of the metrics configuration file is defined in an example configuration file, `$SPARK_HOME/conf/metrics.conf.template`. diff --git a/docs/tuning.md b/docs/tuning.md index f491ae9b95..f33fda37eb 100644 --- a/docs/tuning.md +++ b/docs/tuning.md @@ -67,7 +67,7 @@ The [Kryo documentation](http://code.google.com/p/kryo/) describes more advanced registration options, such as adding custom serialization code. If your objects are large, you may also need to increase the `spark.kryoserializer.buffer.mb` -system property. The default is 32, but this value needs to be large enough to hold the *largest* +system property. The default is 2, but this value needs to be large enough to hold the *largest* object you will serialize. Finally, if you don't register your classes, Kryo will still work, but it will have to store the |