Repository: hbase Updated Branches: refs/heads/0.98 27eef5f73 -> abce9ecb4
HBASE-11388 The order parameter is wrong when invoking the constructor of the ReplicationPeer In the method "getPeer" of the class ReplicationPeersZKImpl (Qianxi Zhang) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/abce9ecb Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/abce9ecb Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/abce9ecb Branch: refs/heads/0.98 Commit: abce9ecb4ccc9a797971cf922b316c573d42d92e Parents: 27eef5f Author: Jean-Daniel Cryans <jdcry...@cloudera.com> Authored: Fri Jul 25 12:36:55 2014 -0700 Committer: Jean-Daniel Cryans <jdcry...@cloudera.com> Committed: Fri Jul 25 12:39:03 2014 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/replication/ReplicationPeer.java | 4 ++-- .../apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/abce9ecb/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java index 1b14dab..dc4da16 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeer.java @@ -73,9 +73,9 @@ public class ReplicationPeer implements Abortable, Closeable { * @param key cluster key used to locate the peer * @param id string representation of this peer's identifier */ - public ReplicationPeer(Configuration conf, String key, String id) throws ReplicationException { + public ReplicationPeer(Configuration conf, String id) throws ReplicationException { this.conf = conf; - this.clusterKey = key; + this.clusterKey = ZKUtil.getZooKeeperClusterKey(conf); this.id = id; try { this.reloadZkWatcher(); http://git-wip-us.apache.org/repos/asf/hbase/blob/abce9ecb/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java index 0d8f0a7..b69367a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/replication/ReplicationPeersZKImpl.java @@ -487,7 +487,7 @@ public class ReplicationPeersZKImpl extends ReplicationStateZKBase implements Re } ReplicationPeer peer = - new ReplicationPeer(peerConf, peerId, ZKUtil.getZooKeeperClusterKey(peerConf)); + new ReplicationPeer(peerConf, peerId); try { peer.startStateTracker(this.zookeeper, this.getPeerStateNode(peerId)); } catch (KeeperException e) {
