Repository: hbase Updated Branches: refs/heads/0.98 da0af93f8 -> a0d0fe9cf
Amend HBASE-11394 Replication can have data loss if peer id contains hyphen Fix compilation error in TestReplicationTrackerZKImpl Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a0d0fe9c Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a0d0fe9c Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a0d0fe9c Branch: refs/heads/0.98 Commit: a0d0fe9cf57dcfa71eeb52962577a2ba35f05c10 Parents: da0af93 Author: Andrew Purtell <[email protected]> Authored: Fri Oct 10 13:59:42 2014 -0700 Committer: Andrew Purtell <[email protected]> Committed: Fri Oct 10 13:59:47 2014 -0700 ---------------------------------------------------------------------- .../hbase/replication/TestReplicationTrackerZKImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/a0d0fe9c/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java index c8e2ef2..99a7593 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationTrackerZKImpl.java @@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; import org.junit.AfterClass; import org.junit.Test; -import org.junit.Ignore; import static org.junit.Assert.*; @@ -178,16 +177,16 @@ public class TestReplicationTrackerZKImpl { public void testPeerNameControl() throws Exception { int exists = 0; int hyphen = 0; - rp.addPeer("6", new ReplicationPeerConfig().setClusterKey(utility.getClusterKey()), null); + rp.addPeer("6", utility.getClusterKey(), null); try{ - rp.addPeer("6", new ReplicationPeerConfig().setClusterKey(utility.getClusterKey()), null); + rp.addPeer("6", utility.getClusterKey(), null); }catch(IllegalArgumentException e){ exists++; } try{ - rp.addPeer("6-ec2", new ReplicationPeerConfig().setClusterKey(utility.getClusterKey()), null); + rp.addPeer("6-ec2", utility.getClusterKey(), null); }catch(IllegalArgumentException e){ hyphen++; }
