diff --git a/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala b/core/src/main/scala/org/apache/spark/ExecutorAllocationManager.scala index 49329423dca7615cdf044e3d2bd39d92f61d0590..0c50b4002cf7b9c699c5ca2ca28deca2e2a36dc4 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) diff --git a/docs/configuration.md b/docs/configuration.md index 892c02b27df32f717abfbd43d01a4aea79377019..443322e1eadf44ca1c9cf40d5101144f5c5af446 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>