hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r619768 - in /hadoop/hbase/trunk: CHANGES.txt build.xml src/test/hbase-site.xml src/test/org/apache/hadoop/hbase/TestRegionServerExit.java
Date Fri, 08 Feb 2008 04:58:01 GMT
Author: jimk
Date: Thu Feb  7 20:58:00 2008
New Revision: 619768

URL: http://svn.apache.org/viewvc?rev=619768&view=rev
Log:
HBASE-421   TestRegionServerExit broken

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/build.xml
    hadoop/hbase/trunk/src/test/hbase-site.xml
    hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestRegionServerExit.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=619768&r1=619767&r2=619768&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Thu Feb  7 20:58:00 2008
@@ -15,6 +15,7 @@
                (Dave Simpson via Bryan Duxbury via Stack)
    HBASE-2     hlog numbers should wrap around when they reach 999
                (Bryan Duxbury via Stack)
+   HBASE-421   TestRegionServerExit broken
 
   IMPROVEMENTS
    HBASE-415   Rewrite leases to use DelayedBlockingQueue instead of polling

Modified: hadoop/hbase/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/build.xml?rev=619768&r1=619767&r2=619768&view=diff
==============================================================================
--- hadoop/hbase/trunk/build.xml (original)
+++ hadoop/hbase/trunk/build.xml Thu Feb  7 20:58:00 2008
@@ -38,7 +38,7 @@
   <property name="docs.dir" value="${basedir}/docs"/>
 
   <property name="test.output" value="no"/>
-  <property name="test.timeout" value="300000"/>
+  <property name="test.timeout" value="360000"/>
 
   <property name="build.dir" location="${basedir}/build"/>
   <property name="build.bin" location="${build.dir}/bin"/>
@@ -277,9 +277,13 @@
   <!-- Run unit tests                                                     -->
   <!-- ================================================================== -->
   <path id="test.classpath">
-    <path refid="classpath"/>
     <pathelement location="${build.test}" />
     <pathelement location="${src.test}"/>
+    <!-- ============  *  *  *  *  *  N O T E  *  *  *  *  * ============
+           ${src.test} *must* come before rest of class path. Otherwise
+                    the test hbase-site.xml will not be found.
+         ============  *  *  *  *  *  N O T E  *  *  *  *  * ============ -->
+    <path refid="classpath"/>
     <pathelement location="${conf.dir}"/>
     <pathelement location="${build.dir}"/>
     <pathelement location="${build.webapps}"/>
@@ -309,7 +313,7 @@
     <mkdir dir="${test.log.dir}"/>
     <junit
       printsummary="yes" showoutput="${test.output}" 
-      haltonfailure="no" fork="yes" maxmemory="256m"
+      haltonfailure="no" fork="yes" maxmemory="512m"
       errorProperty="tests.failed" failureProperty="tests.failed"
       timeout="${test.timeout}">
       

Modified: hadoop/hbase/trunk/src/test/hbase-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/hbase-site.xml?rev=619768&r1=619767&r2=619768&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/hbase-site.xml (original)
+++ hadoop/hbase/trunk/src/test/hbase-site.xml Thu Feb  7 20:58:00 2008
@@ -89,20 +89,6 @@
     </description>
   </property>
   <property>
-    <name>hbase.master.info.port</name>
-    <value>-1</value>
-    <description>The port for the hbase master web UI
-    Set to -1 if you do not want the info server to run.
-    </description>
-  </property>
-  <property>
-    <name>hbase.regionserver.info.port</name>
-    <value>-1</value>
-    <description>The port for the hbase regionserver web UI
-    Set to -1 if you do not want the info server to run.
-    </description>
-  </property>
-  <property>
     <name>hbase.master.lease.thread.wakefrequency</name>
     <value>3000</value>
     <description>The interval between checks for expired region server leases.

Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestRegionServerExit.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestRegionServerExit.java?rev=619768&r1=619767&r2=619768&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestRegionServerExit.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestRegionServerExit.java Thu Feb
 7 20:58:00 2008
@@ -28,6 +28,8 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.io.Text;
 
+import org.apache.hadoop.hbase.io.BatchUpdate;
+
 /**
  * Tests region server failover when a region server exits both cleanly and
  * when it aborts.
@@ -95,10 +97,10 @@
     // put some values in the table
     this.table = new HTable(conf, new Text(tableName));
     final Text row = new Text("row1");
-    long lockid = table.startUpdate(row);
-    table.put(lockid, HConstants.COLUMN_FAMILY,
+    BatchUpdate b = new BatchUpdate(row);
+    b.put(HConstants.COLUMN_FAMILY,
         tableName.getBytes(HConstants.UTF8_ENCODING));
-    table.commit(lockid);
+    table.commit(b);
     return row;
   }
 
@@ -179,8 +181,9 @@
                 HConstants.UTF8_ENCODING)));
           }
           LOG.info("Success!");
-        } catch (IOException e) {
+        } catch (Exception e) {
           e.printStackTrace();
+          fail();
         } finally {
           if (scanner != null) {
             LOG.info("Closing scanner " + scanner);



Mime
View raw message