Updated Branches:
refs/heads/branch-0.8 c89b71ac7 -> 62b3158b8
Merge pull request #583 from colorant/zookeeper.
Minor fix for ZooKeeperPersistenceEngine to use configured working dir
Author: Raymond Liu <raymond....@intel.com>
Closes #583 and squashes the following commits:
91b0609 [Raymond Liu] Minor fix for ZooKeeperPersistenceEngine to use
configured working dir
(cherry picked from commit 68b2c0d02dbdca246ca686b871c06af53845d5b5)
Signed-off-by: Aaron Davidson <aa...@databricks.com>
Conflicts:
core/src/main/scala/org/apache/spark/deploy/master/ZooKeeperPersistenceEngine.scala
Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/62b3158b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/62b3158b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/62b3158b
Branch: refs/heads/branch-0.8
Commit: 62b3158b80c14668b16476818d72f1296b06da66
Parents: c89b71a
Author: Raymond Liu <raymond....@intel.com>
Authored: Tue Feb 11 22:39:48 2014 -0800
Committer: Aaron Davidson <aa...@databricks.com>
Committed: Tue Feb 11 22:48: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/62b3158b/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 a0233a7..f1dca28 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
@@ -77,7 +77,7 @@ class ZooKeeperPersistenceEngine(serialization: Serialization)
}
def deserializeFromFile[T <: Serializable](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.erasure.asInstanceOf[Class[T]]
val serializer = serialization.serializerFor(clazz)
serializer.fromBinary(fileData).asInstanceOf[T]
