[SPARK-5932] Updated spark.broadcast.blockSize

Ilya Ganelin · Ilya Ganelin · commit 1fbd435e1672 · 2015-04-18T13:32:35.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/SparkConf.scala b/core/src/main/scala/org/apache/spark/SparkConf.scala
@@ -483,7 +483,6 @@ private[spark] object SparkConf extends Logging {
         "Please use spark.kryoserializer.buffer.max instead."),
       DeprecatedConfig("spark.shuffle.file.buffer.kb", "1.4",
         "Please use spark.shuffle.file.buffer instead."))
-
     
 
     
diff --git a/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala b/core/src/main/scala/org/apache/spark/broadcast/TorrentBroadcast.scala
@@ -74,7 +74,7 @@ private[spark] class TorrentBroadcast[T: ClassTag](obj: T, id: Long)
     } else {
       None
     }
-    blockSize = conf.getInt("spark.broadcast.blockSize", 4096) * 1024
+    blockSize = conf.getSizeAsKb("spark.broadcast.blockSize", "4m").toInt * 1024
   }
   setConf(SparkEnv.get.conf)
 

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ private[spark] class TorrentBroadcast[T: ClassTag](obj: T, id: Long)`
`74`	`74`	`} else {`
`75`	`75`	`None`
`76`	`76`	`}`
`77`		`- blockSize = conf.getInt("spark.broadcast.blockSize", 4096) * 1024`
	`77`	`+ blockSize = conf.getSizeAsKb("spark.broadcast.blockSize", "4m").toInt * 1024`
`78`	`78`	`}`
`79`	`79`	`setConf(SparkEnv.get.conf)`
`80`	`80`