Github user rdblue commented on a diff in the pull request: https://github.com/apache/spark/pull/13338#discussion_r66685637 --- Diff: core/src/main/scala/org/apache/spark/util/Utils.scala --- @@ -2262,21 +2262,39 @@ private[spark] object Utils extends Logging { } /** - * Return whether dynamic allocation is enabled in the given conf - * Dynamic allocation and explicitly setting the number of executors are inherently - * incompatible. In environments where dynamic allocation is turned on by default, - * the latter should override the former (SPARK-9092). + * Return whether dynamic allocation is enabled in the given conf. */ def isDynamicAllocationEnabled(conf: SparkConf): Boolean = { - val numExecutor = conf.getInt("spark.executor.instances", 0) val dynamicAllocationEnabled = conf.getBoolean("spark.dynamicAllocation.enabled", false) - if (numExecutor != 0 && dynamicAllocationEnabled) { - logWarning("Dynamic Allocation and num executors both set, thus dynamic allocation disabled.") - } - numExecutor == 0 && dynamicAllocationEnabled && + dynamicAllocationEnabled && (!isLocalMaster(conf) || conf.getBoolean("spark.dynamicAllocation.testing", false)) } + /** + * Return the minimum number of executors for dynamic allocation. + */ + def getDynamicAllocationMinExecutors(conf: SparkConf): Int = { + conf.getInt("spark.dynamicAllocation.minExecutors", 0) --- End diff -- What's the value of these constants over util methods? These constants live in the yarn module, but there are uses in the `ExecutorAllocationManager` in core. Rather than having the constants in two places, with possibly different defaults, I thought a util method was appropriate.
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. --- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org