You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ad...@apache.org on 2014/02/12 07:39:59 UTC
git commit: Merge pull request #583 from colorant/zookeeper.
Updated Branches:
refs/heads/master b0dab1bb9 -> 68b2c0d02
Merge pull request #583 from colorant/zookeeper.
Minor fix for ZooKeeperPersistenceEngine to use configured working dir
Author: Raymond Liu <ra...@intel.com>
Closes #583 and squashes the following commits:
91b0609 [Raymond Liu] Minor fix for ZooKeeperPersistenceEngine to use configured working dir
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/68b2c0d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/68b2c0d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/68b2c0d0
Branch: refs/heads/master
Commit: 68b2c0d02dbdca246ca686b871c06af53845d5b5
Parents: b0dab1b
Author: Raymond Liu <ra...@intel.com>
Authored: Tue Feb 11 22:39:48 2014 -0800
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Tue Feb 11 22:39:48 2014 -0800
----------------------------------------------------------------------
.../apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/68b2c0d0/core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala
----------------------------------------------------------------------
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 f24f49e..10816a1 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]