aboutsummaryrefslogtreecommitdiff
path: root/docs/running-on-yarn.md
diff options
context:
space:
mode:
authorNiranjan Padmanabhan <niranjan.padmanabhan@cloudera.com>2015-08-12 16:10:21 -0700
committerMarcelo Vanzin <vanzin@cloudera.com>2015-08-12 16:10:21 -0700
commit738f353988dbf02704bd63f5e35d94402c59ed79 (patch)
tree1ef4619abe50dd2ebe51218afddeaa7051312cf9 /docs/running-on-yarn.md
parenta17384fa343628cec44437da5b80b9403ecd5838 (diff)
downloadspark-738f353988dbf02704bd63f5e35d94402c59ed79.tar.gz
spark-738f353988dbf02704bd63f5e35d94402c59ed79.tar.bz2
spark-738f353988dbf02704bd63f5e35d94402c59ed79.zip
[SPARK-9092] Fixed incompatibility when both num-executors and dynamic...
… allocation are set. Now, dynamic allocation is set to false when num-executors is explicitly specified as an argument. Consequently, executorAllocationManager in not initialized in the SparkContext. Author: Niranjan Padmanabhan <niranjan.padmanabhan@cloudera.com> Closes #7657 from neurons/SPARK-9092.
Diffstat (limited to 'docs/running-on-yarn.md')
-rw-r--r--docs/running-on-yarn.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/running-on-yarn.md b/docs/running-on-yarn.md
index cac08a91b9..ec32c419b7 100644
--- a/docs/running-on-yarn.md
+++ b/docs/running-on-yarn.md
@@ -199,7 +199,7 @@ If you need a reference to the proper location to put log files in the YARN so t
<td><code>spark.executor.instances</code></td>
<td>2</td>
<td>
- The number of executors. Note that this property is incompatible with <code>spark.dynamicAllocation.enabled</code>.
+ The number of executors. Note that this property is incompatible with <code>spark.dynamicAllocation.enabled</code>. If both <code>spark.dynamicAllocation.enabled</code> and <code>spark.executor.instances</code> are specified, dynamic allocation is turned off and the specified number of <code>spark.executor.instances</code> is used.
</td>
</tr>
<tr>