From ffb8e00b2b7c3f23bb54a0c9da6e4e69501ef3ac Mon Sep 17 00:00:00 2001 From: Zhan Zhang Date: Mon, 20 Apr 2015 17:21:07 -0700 Subject: [PATCH] rebase to sparkcontext change --- core/src/main/scala/org/apache/spark/SparkContext.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index c99d9544ad833..31aefd1c79aa2 100644 --- 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")