[SPARK-4880] remove spark.locality.wait in Analytics

Earne · rxin · commit a7ed6f3cc537 · 2014-12-18T15:42:26.000-08:00
spark.locality.wait set to 100000 in examples/graphx/Analytics.scala. Should be left to the user. Author: Ernest <earneyzxl@gmail.com> Closes #3730 from Earne/SPARK-4880 and squashes the following commits: d79ed04 [Ernest] remove spark.locality.wait in Analytics
diff --git a/examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala b/examples/src/main/scala/org/apache/spark/examples/graphx/Analytics.scala
@@ -46,7 +46,7 @@ object Analytics extends Logging {
     }
     val options = mutable.Map(optionsList: _*)
 
-    val conf = new SparkConf().set("spark.locality.wait", "100000")
+    val conf = new SparkConf()
     GraphXUtils.registerKryoClasses(conf)
 
     val numEPart = options.remove("numEPart").map(_.toInt).getOrElse {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ object Analytics extends Logging {`
`46`	`46`	`}`
`47`	`47`	`val options = mutable.Map(optionsList: _*)`
`48`	`48`
`49`		`- val conf = new SparkConf().set("spark.locality.wait", "100000")`
	`49`	`+ val conf = new SparkConf()`
`50`	`50`	`GraphXUtils.registerKryoClasses(conf)`
`51`	`51`
`52`	`52`	`val numEPart = options.remove("numEPart").map(_.toInt).getOrElse {`