svn commit: r1179292 - in /hbase/branches/0.90: CHANGES.txt src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java

[st...@apache.org]

Author: stack
Date: Wed Oct  5 16:13:17 2011
New Revision: 1179292

URL: http://svn.apache.org/viewvc?rev=1179292&view=rev
Log:
HBASE-4481 TestMergeTool failed in 0.92 build 20

Modified:
    hbase/branches/0.90/CHANGES.txt
    hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java

Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1179292&r1=1179291&r2=1179292&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed Oct  5 16:13:17 2011
@@ -69,6 +69,7 @@ Release 0.90.5 - Unreleased
    HBASE-4515  User.getCurrent() can fail to initialize the current user
    HBASE-4473  NPE when executors are down but events are still coming in
    HBASE-4537  TestUser imports breaking build against secure Hadoop
+   HBASE-4481  TestMergeTool failed in 0.92 build 20
 
   IMPROVEMENT
    HBASE-4205  Enhance HTable javadoc (Eric Charles)

Modified: hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java?rev=1179292&r1=1179291&r2=1179292&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/util/TestMergeTool.java Wed Oct  5 16:13:17 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");