Author: stack
Date: Wed Oct 5 16:11:20 2011
New Revision: 1179288
URL: http://svn.apache.org/viewvc?rev=1179288&view=rev
Log:
HBASE-4481 TestMergeTool failed in 0.92 build 20
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
Modified: hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1179288&r1=1179287&r2=1179288&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Oct 5 16:11:20 2011
@@ -337,6 +337,7 @@ Release 0.92.0 - Unreleased
HBASE-4334 HRegion.get never validates row (Lars Hofhansl)
HBASE-4494 AvroServer:: get fails with NPE on a non-existent row
(Kay Kay)
+ HBASE-4481 TestMergeTool failed in 0.92 build 20
TESTS
HBASE-4450 test for number of blocks read: to serve as baseline for
expected
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java?rev=1179288&r1=1179287&r2=1179288&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
Wed Oct 5 16:11:20 2011
@@ -60,6 +60,11 @@ public class TestMergeTool extends HBase
public void setUp() throws Exception {
// Set the timeout down else this test will take a while to complete.
this.conf.setLong("hbase.zookeeper.recoverable.waittime", 1000);
+ // Make it so we try and connect to a zk that is not there (else we might
+ // find a zk ensemble put up by another concurrent test and this will
+ // mess up this test. Choose unlikely port. Default test port is 21818.
+ // Default zk port is 2181.
+ this.conf.setInt("hbase.zookeeper.property.clientPort", 10001);
this.conf.set("hbase.hstore.compactionThreshold", "2");
