[SPARK-5932] Updated spark.executor.logs.rolling.size.maxBytes

Author: Ilya Ganelin

core/src/main/scala/org/apache/spark/SparkConf.scala

@@ -482,10 +482,11 @@ private[spark] object SparkConf extends Logging {
       DeprecatedConfig("spark.kryoserializer.buffer.max.mb", "1.4",
         "Please use spark.kryoserializer.buffer.max instead."),
       DeprecatedConfig("spark.shuffle.file.buffer.kb", "1.4",
-        "Please use spark.shuffle.file.buffer instead."))
-    
+        "Please use spark.shuffle.file.buffer instead."),
+      DeprecatedConfig("spark.executor.logs.rolling.size.maxBytes", "1.4",
+        "Please use spark.executor.logs.rolling.maxSize instead."))
+
 
-    
     Map(configs.map { cfg => (cfg.key -> cfg) }:_*)
   }
 
@@ -517,7 +518,9 @@ private[spark] object SparkConf extends Logging {
     "spark.kryoserializer.buffer.max" -> Seq(
       AlternateConfig("spark.kryoserializer.buffer.max.mb", "1.4")),
     "spark.shuffle.file.buffer" -> Seq(
-      AlternateConfig("spark.shuffle.file.buffer.kb", "1.4"))
+      AlternateConfig("spark.shuffle.file.buffer.kb", "1.4")),
+    "spark.executor.logs.rolling.maxSize" -> Seq(
+      AlternateConfig("spark.executor.logs.rolling.size.maxBytes", "1.4"))
   )
 
   /**

core/src/main/scala/org/apache/spark/util/logging/RollingFileAppender.scala

@@ -138,7 +138,7 @@ private[spark] object RollingFileAppender {
   val STRATEGY_DEFAULT = ""
   val INTERVAL_PROPERTY = "spark.executor.logs.rolling.time.interval"
   val INTERVAL_DEFAULT = "daily"
-  val SIZE_PROPERTY = "spark.executor.logs.rolling.size.maxBytes"
+  val SIZE_PROPERTY = "spark.executor.logs.rolling.maxSize"
   val SIZE_DEFAULT = (1024 * 1024).toString
   val RETAINED_FILES_PROPERTY = "spark.executor.logs.rolling.maxRetainedFiles"
   val DEFAULT_BUFFER_SIZE = 8192