You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@giraph.apache.org by cl...@apache.org on 2013/11/18 15:00:40 UTC

git commit: updated refs/heads/trunk to 52a6d3e

Updated Branches:
  refs/heads/trunk 3e88476ce -> 52a6d3e6a


GIRAPH-442


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/52a6d3e6
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/52a6d3e6
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/52a6d3e6

Branch: refs/heads/trunk
Commit: 52a6d3e6aa04c977310f0dc46bb18901812e272a
Parents: 3e88476
Author: Claudio Martella <cl...@gmail.com>
Authored: Mon Nov 18 15:00:06 2013 +0100
Committer: Claudio Martella <cl...@gmail.com>
Committed: Mon Nov 18 15:00:06 2013 +0100

----------------------------------------------------------------------
 CHANGELOG                                                    | 3 +++
 .../src/main/java/org/apache/giraph/zk/ZooKeeperManager.java | 8 ++++++++
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/52a6d3e6/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index ffa9864..2a1d399 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,9 @@
 Giraph Change Log
 
 Release 1.1.0 - unreleased
+  GIRAPH-442: FileNotFoundException: <baseDirectory>/_zkServer is checked before it is created
+  (miteshsjat via claudio)
+
   GIRAPH-796: Site build error with maven 3.1 (armax00 via claudio)
 
   GIRAPH-749: Update documentation according to the new EdgeOutputFormat API 

http://git-wip-us.apache.org/repos/asf/giraph/blob/52a6d3e6/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
index 3364dfd..b3db28f 100644
--- a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
+++ b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperManager.java
@@ -289,6 +289,14 @@ public class ZooKeeperManager {
       LOG.error("createCandidateStamp: Failed to mkdirs " +
           baseDirectory);
     }
+    try {
+      fs.mkdirs(serverDirectory);
+      LOG.info("createCandidateStamp: Made the directory " +
+          serverDirectory);
+    } catch (IOException e) {
+      LOG.error("createCandidateStamp: Failed to mkdirs " +
+          serverDirectory);
+    }
     // Check that the base directory exists and is a directory
     try {
       if (!fs.getFileStatus(baseDirectory).isDir()) {