diff options
| author | Raymond Liu <raymond.liu@intel.com> | 2014-02-11 22:39:48 -0800 |
|---|---|---|
| committer | Aaron Davidson <aaron@databricks.com> | 2014-02-11 22:39:48 -0800 |
| commit | 68b2c0d02dbdca246ca686b871c06af53845d5b5 (patch) | |
| tree | d5a887b87b5cbd603aa83b06fd58efb630e87060 /core | |
| parent | b0dab1bb9f4cfacae68b106a44d9b14f6bea3d29 (diff) | |
| download | spark-68b2c0d02dbdca246ca686b871c06af53845d5b5.tar.gz spark-68b2c0d02dbdca246ca686b871c06af53845d5b5.tar.bz2 spark-68b2c0d02dbdca246ca686b871c06af53845d5b5.zip | |
Merge pull request #583 from colorant/zookeeper.
Minor fix for ZooKeeperPersistenceEngine to use configured working dir
Author: Raymond Liu <raymond.liu@intel.com>
Closes #583 and squashes the following commits:
91b0609 [Raymond Liu] Minor fix for ZooKeeperPersistenceEngine to use configured working dir
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala b/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala index f24f49ea8a..10816a1f43 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala @@ -87,7 +87,7 @@ class ZooKeeperPersistenceEngine(serialization: Serialization, conf: SparkConf) } def deserializeFromFile[T](filename: String)(implicit m: Manifest[T]): T = { - val fileData = zk.getData("/spark/master_status/" + filename) + val fileData = zk.getData(WORKING_DIR + "/" + filename) val clazz = m.runtimeClass.asInstanceOf[Class[T]] val serializer = serialization.serializerFor(clazz) serializer.fromBinary(fileData).asInstanceOf[T] |