rebase to sparkcontext change

zhzhan · zhzhan · commit ffb8e00b2b7c · 2015-04-30T19:04:00.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -252,7 +252,6 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
   val extBlkFolderName = "spark-" + randomUUID.toString()
   @deprecated("Use extBlkFolderName instead.", "1.4.0")
   val tachyonFolderName = extBlkFolderName
-  conf.set("spark.extBlkStore.folderName", extBlkFolderName)
 
   def isLocal: Boolean = (master == "local" || master.startsWith("local["))
 
@@ -389,7 +388,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli
       }
     }
 
-    _conf.set("spark.tachyonStore.folderName", tachyonFolderName)
+    _conf.set("spark.extBlkStore.folderName", extBlkFolderName)
 
     if (master == "yarn-client") System.setProperty("SPARK_YARN_MODE", "true")
 

Original file line number	Diff line number	Diff line change
`@@ -252,7 +252,6 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli`
`252`	`252`	`val extBlkFolderName = "spark-" + randomUUID.toString()`
`253`	`253`	`@deprecated("Use extBlkFolderName instead.", "1.4.0")`
`254`	`254`	`val tachyonFolderName = extBlkFolderName`
`255`		`- conf.set("spark.extBlkStore.folderName", extBlkFolderName)`
`256`	`255`
`257`	`256`	`def isLocal: Boolean = (master == "local" \|\| master.startsWith("local["))`
`258`	`257`
`@@ -389,7 +388,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli`
`389`	`388`	`}`
`390`	`389`	`}`
`391`	`390`
`392`		`- _conf.set("spark.tachyonStore.folderName", tachyonFolderName)`
	`391`	`+ _conf.set("spark.extBlkStore.folderName", extBlkFolderName)`
`393`	`392`
`394`	`393`	`if (master == "yarn-client") System.setProperty("SPARK_YARN_MODE", "true")`
`395`	`394`