[SPARK-11686][CORE] Issue WARN when dynamic allocation is disabled due to spark.dynamicAllocation.enabled and spark.executor.instances both set

Ashwin Swaroop · srowen · commit a986a3bde742 · 2015-11-25T13:41:26.000Z
Changed the log type to a 'warning' instead of 'info' as required. Author: Ashwin Swaroop <Ashwin Swaroop> Closes #9926 from ashwinswaroop/master. (cherry picked from commit 6385002) Signed-off-by: Sean Owen <sowen@cloudera.com>
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -556,7 +556,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
     // Optionally scale number of executors dynamically based on workload. Exposed for testing.
     val dynamicAllocationEnabled = Utils.isDynamicAllocationEnabled(_conf)
     if (!dynamicAllocationEnabled && _conf.getBoolean("spark.dynamicAllocation.enabled", false)) {
-      logInfo("Dynamic Allocation and num executors both set, thus dynamic allocation disabled.")
+      logWarning("Dynamic Allocation and num executors both set, thus dynamic allocation disabled.")
     }
 
     _executorAllocationManager =

Original file line number	Diff line number	Diff line change
`@@ -556,7 +556,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli`
`556`	`556`	`// Optionally scale number of executors dynamically based on workload. Exposed for testing.`
`557`	`557`	`val dynamicAllocationEnabled = Utils.isDynamicAllocationEnabled(_conf)`
`558`	`558`	`if (!dynamicAllocationEnabled && _conf.getBoolean("spark.dynamicAllocation.enabled", false)) {`
`559`		`- logInfo("Dynamic Allocation and num executors both set, thus dynamic allocation disabled.")`
	`559`	`+ logWarning("Dynamic Allocation and num executors both set, thus dynamic allocation disabled.")`
`560`	`560`	`}`
`561`	`561`
`562`	`562`	`_executorAllocationManager =`