Index: src/test/hbase-site.xml
===================================================================
--- src/test/hbase-site.xml (revision 619747)
+++ src/test/hbase-site.xml (working copy)
@@ -89,20 +89,6 @@
- hbase.master.info.port
- -1
- The port for the hbase master web UI
- Set to -1 if you do not want the info server to run.
-
-
-
- hbase.regionserver.info.port
- -1
- The port for the hbase regionserver web UI
- Set to -1 if you do not want the info server to run.
-
-
-
hbase.master.lease.thread.wakefrequency
3000
The interval between checks for expired region server leases.
Index: src/test/org/apache/hadoop/hbase/TestRegionServerExit.java
===================================================================
--- src/test/org/apache/hadoop/hbase/TestRegionServerExit.java (revision 619747)
+++ src/test/org/apache/hadoop/hbase/TestRegionServerExit.java (working copy)
@@ -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);
Index: build.xml
===================================================================
--- build.xml (revision 619747)
+++ build.xml (working copy)
@@ -38,7 +38,7 @@
-
+
@@ -277,9 +277,13 @@
-
+
+
@@ -309,7 +313,7 @@