Repository: spark Updated Branches: refs/heads/master 11e22b74a -> 5dd45bde4
[SPARK-8958] Dynamic allocation: change cached timeout to infinity pwendell and I discussed this a little more offline and concluded that it would be good to keep it more conservative. Losing cached blocks may be very expensive and we should only allow it if the user knows what he/she is doing. FYI harishreedharan sryza. Author: Andrew Or <and...@databricks.com> Closes #7329 from andrewor14/da-cached-timeout and squashes the following commits: cef0b4e [Andrew Or] Change timeout to infinity Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5dd45bde Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5dd45bde Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5dd45bde Branch: refs/heads/master Commit: 5dd45bde4ae6f5a10cfe005de3041abd075da4d6 Parents: 11e22b7 Author: Andrew Or <and...@databricks.com> Authored: Fri Jul 10 09:48:17 2015 -0700 Committer: Andrew Or <and...@databricks.com> Committed: Fri Jul 10 09:48:17 2015 -0700 ---------------------------------------------------------------------- .../main/scala/org/apache/spark/ExecutorAllocationManager.scala | 2 +- docs/configuration.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/5dd45bde/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala b/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala index 4932942..0c50b40 100644 --- a/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala +++ b/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala @@ -102,7 +102,7 @@ private[spark] class ExecutorAllocationManager( "spark.dynamicAllocation.executorIdleTimeout", "60s") private val cachedExecutorIdleTimeoutS = conf.getTimeAsSeconds( - "spark.dynamicAllocation.cachedExecutorIdleTimeout", s"${2 * executorIdleTimeoutS}s") + "spark.dynamicAllocation.cachedExecutorIdleTimeout", s"${Integer.MAX_VALUE}s") // During testing, the methods to actually kill and add executors are mocked out private val testing = conf.getBoolean("spark.dynamicAllocation.testing", false) http://git-wip-us.apache.org/repos/asf/spark/blob/5dd45bde/docs/configuration.md ---------------------------------------------------------------------- diff --git a/docs/configuration.md b/docs/configuration.md index 892c02b..443322e 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -1206,7 +1206,7 @@ Apart from these, the following properties are also available, and may be useful </tr> <tr> <td><code>spark.dynamicAllocation.cachedExecutorIdleTimeout</code></td> - <td>2 * executorIdleTimeout</td> + <td>infinity</td> <td> If dynamic allocation is enabled and an executor which has cached data blocks has been idle for more than this duration, the executor will be removed. For more details, see this @@ -1222,7 +1222,7 @@ Apart from these, the following properties are also available, and may be useful </tr> <tr> <td><code>spark.dynamicAllocation.maxExecutors</code></td> - <td>Integer.MAX_VALUE</td> + <td>infinity</td> <td> Upper bound for the number of executors if dynamic allocation is enabled. </td> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
