You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/09/07 18:35:44 UTC
hbase git commit: HBASE-16572 Sync method in RecoverableZooKeeper
failed to pass callback function in (Allan Yang)
Repository: hbase
Updated Branches:
refs/heads/master 7363a7666 -> e9cfbfd10
HBASE-16572 Sync method in RecoverableZooKeeper failed to pass callback function in (Allan Yang)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e9cfbfd1
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e9cfbfd1
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e9cfbfd1
Branch: refs/heads/master
Commit: e9cfbfd107ab1e368b48b9c44b71e02a81a6ca19
Parents: 7363a76
Author: tedyu <yu...@gmail.com>
Authored: Wed Sep 7 11:35:35 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Wed Sep 7 11:35:35 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java | 2 +-
.../src/main/java/org/apache/hadoop/hbase/master/HMaster.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e9cfbfd1/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
index e8db4da..371279e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/RecoverableZooKeeper.java
@@ -763,7 +763,7 @@ public class RecoverableZooKeeper {
}
public void sync(String path, AsyncCallback.VoidCallback cb, Object ctx) throws KeeperException {
- checkZk().sync(path, null, null);
+ checkZk().sync(path, cb, null);
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/e9cfbfd1/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index c643fa8..0e07ae0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -196,6 +196,7 @@ import org.mortbay.jetty.servlet.Context;
public class HMaster extends HRegionServer implements MasterServices {
private static final Log LOG = LogFactory.getLog(HMaster.class.getName());
+
/**
* Protection against zombie master. Started once Master accepts active responsibility and
* starts taking over responsibilities. Allows a finite time window before giving up ownership.