You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2010/04/02 11:13:33 UTC
svn commit: r930195 -
/hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
Author: apurtell
Date: Fri Apr 2 09:13:33 2010
New Revision: 930195
URL: http://svn.apache.org/viewvc?rev=930195&view=rev
Log:
HBASE-2392 upgrade to ZooKeeper 3.3.0; fix up HQuorumPeer test
Modified:
hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
Modified: hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java?rev=930195&r1=930194&r2=930195&view=diff
==============================================================================
--- hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java (original)
+++ hadoop/hbase/trunk/core/src/test/java/org/apache/hadoop/hbase/zookeeper/TestHQuorumPeer.java Fri Apr 2 09:13:33 2010
@@ -65,9 +65,6 @@ public class TestHQuorumPeer extends HBa
/** */
public void testMakeZKProps() {
Properties properties = HQuorumPeer.makeZKProps(conf);
- assertEquals(3000, Integer.parseInt(properties.getProperty("tickTime")));
- assertEquals(Integer.valueOf(10), Integer.valueOf(properties.getProperty("initLimit")));
- assertEquals(Integer.valueOf(5), Integer.valueOf(properties.getProperty("syncLimit")));
assertEquals(dataDir.toString(), properties.get("dataDir"));
assertEquals(Integer.valueOf(21810), Integer.valueOf(properties.getProperty("clientPort")));
assertEquals("localhost:2888:3888", properties.get("server.0"));
@@ -76,9 +73,6 @@ public class TestHQuorumPeer extends HBa
String oldValue = conf.get(HConstants.ZOOKEEPER_QUORUM);
conf.set(HConstants.ZOOKEEPER_QUORUM, "a.foo.bar,b.foo.bar,c.foo.bar");
properties = HQuorumPeer.makeZKProps(conf);
- assertEquals(3000, Integer.parseInt(properties.getProperty("tickTime")));
- assertEquals(Integer.valueOf(10), Integer.valueOf(properties.getProperty("initLimit")));
- assertEquals(Integer.valueOf(5), Integer.valueOf(properties.getProperty("syncLimit")));
assertEquals(dataDir.toString(), properties.get("dataDir"));
assertEquals(Integer.valueOf(21810), Integer.valueOf(properties.getProperty("clientPort")));
assertEquals("a.foo.bar:2888:3888", properties.get("server.0"));
@@ -91,9 +85,6 @@ public class TestHQuorumPeer extends HBa
/** @throws Exception */
public void testConfigInjection() throws Exception {
String s =
- "tickTime=2000\n" +
- "initLimit=10\n" +
- "syncLimit=5\n" +
"dataDir=${hbase.tmp.dir}/zookeeper\n" +
"clientPort=2181\n" +
"server.0=${hbase.master.hostname}:2888:3888\n";
@@ -102,9 +93,6 @@ public class TestHQuorumPeer extends HBa
InputStream is = new ByteArrayInputStream(s.getBytes());
Properties properties = HQuorumPeer.parseZooCfg(conf, is);
- assertEquals(Integer.valueOf(2000), Integer.valueOf(properties.getProperty("tickTime")));
- assertEquals(Integer.valueOf(10), Integer.valueOf(properties.getProperty("initLimit")));
- assertEquals(Integer.valueOf(5), Integer.valueOf(properties.getProperty("syncLimit")));
assertEquals(dataDir.toString(), properties.get("dataDir"));
assertEquals(Integer.valueOf(2181), Integer.valueOf(properties.getProperty("clientPort")));
assertEquals("localhost:2888:3888", properties.get("server.0"));
@@ -112,12 +100,6 @@ public class TestHQuorumPeer extends HBa
QuorumPeerConfig config = new QuorumPeerConfig();
config.parseProperties(properties);
- int tickTime = config.getTickTime();
- assertEquals(2000, tickTime);
- int initLimit = config.getInitLimit();
- assertEquals(10, initLimit);
- int syncLimit = config.getSyncLimit();
- assertEquals(5, syncLimit);
assertEquals(dataDir.toString(), config.getDataDir());
assertEquals(2181, config.getClientPortAddress().getPort());
Map<Long,QuorumServer> servers = config.getServers();