GIRAPH-1098 Job may get stuck if zookeeper port fixed and is in use Test Plan: mvn clean verify -Phadoop_facebook
Reviewers: majakabiljo, dionysis.logothetis, maja.kabiljo Reviewed By: maja.kabiljo Differential Revision: https://reviews.facebook.net/D60945 Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/7e9ba531 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/7e9ba531 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/7e9ba531 Branch: refs/heads/release-1.2 Commit: 7e9ba5312a941ec13ec900989c4a8e229ff034c9 Parents: 13b8559 Author: Sergey Edunov <edu...@fb.com> Authored: Wed Jul 20 10:20:36 2016 -0700 Committer: Sergey Edunov <edu...@fb.com> Committed: Thu Aug 25 11:38:33 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/giraph/zk/InProcessZooKeeperRunner.java | 9 ++------- .../main/java/org/apache/giraph/zk/ZooKeeperManager.java | 2 +- .../src/main/java/org/apache/giraph/zk/ZooKeeperRunner.java | 4 +++- 3 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/7e9ba531/giraph-core/src/main/java/org/apache/giraph/zk/InProcessZooKeeperRunner.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/zk/InProcessZooKeeperRunner.java b/giraph-core/src/main/java/org/apache/giraph/zk/InProcessZooKeeperRunner.java index 4f15f3a..cee2c78 100644 --- a/giraph-core/src/main/java/org/apache/giraph/zk/InProcessZooKeeperRunner.java +++ b/giraph-core/src/main/java/org/apache/giraph/zk/InProcessZooKeeperRunner.java @@ -47,13 +47,8 @@ public class InProcessZooKeeperRunner private QuorumRunner quorumRunner = new QuorumRunner(); @Override - public int start(String zkDir, final ZookeeperConfig config) { - try { - return quorumRunner.start(config); - } catch (IOException e) { - LOG.error("Unable to start zookeeper", e); - } - return -1; + public int start(String zkDir, ZookeeperConfig config) throws IOException { + return quorumRunner.start(config); } @Override http://git-wip-us.apache.org/repos/asf/giraph/blob/7e9ba531/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 097172d..b843882 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 @@ -457,7 +457,7 @@ public class ZooKeeperManager { * If this task has been selected, online a ZooKeeper server. Otherwise, * wait until this task knows that the ZooKeeper servers have been onlined. */ - public void onlineZooKeeperServer() { + public void onlineZooKeeperServer() throws IOException { if (zkServerTask == taskPartition) { File zkDirFile = new File(this.zkDir); try { http://git-wip-us.apache.org/repos/asf/giraph/blob/7e9ba531/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperRunner.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperRunner.java b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperRunner.java index 2797047..9d6a332 100644 --- a/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperRunner.java +++ b/giraph-core/src/main/java/org/apache/giraph/zk/ZooKeeperRunner.java @@ -19,6 +19,8 @@ package org.apache.giraph.zk; import org.apache.giraph.conf.ImmutableClassesGiraphConfigurable; +import java.io.IOException; + /** * ZooKeeper wrapper interface. * Implementation should provide a way to start, stop and cleanup @@ -33,7 +35,7 @@ public interface ZooKeeperRunner extends ImmutableClassesGiraphConfigurable { * @param config zookeeper configuration * @return port zookeeper runs on */ - int start(String zkDir, ZookeeperConfig config); + int start(String zkDir, ZookeeperConfig config) throws IOException; /** * Stops zookeeper.