Index: hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java (revision 1438951) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java (working copy) @@ -61,14 +61,16 @@ Configuration config = getConfForNodeHealthScript(); config.addResource(healthScriptFile.getName()); String location = healthScriptFile.getAbsolutePath(); - long timeout = config.getLong(HConstants.HEALTH_SCRIPT_TIMEOUT, 100); + long timeout = config.getLong(HConstants.HEALTH_SCRIPT_TIMEOUT, 200); + HealthChecker checker = new HealthChecker(); + checker.init(location, timeout); + String normalScript = "echo \"I am all fine\""; createScript(normalScript, true); - HealthChecker checker = new HealthChecker(); - checker.init(location, timeout); HealthReport report = checker.checkHealth(); - assertTrue(report.getStatus() == HealthCheckerExitStatus.SUCCESS); + HealthCheckerExitStatus stat = report.getStatus(); + assertTrue("Got " + stat, stat == HealthCheckerExitStatus.SUCCESS); LOG.info("Health Status:" + checker); String errorScript = "echo ERROR\n echo \"Server not healthy\""; @@ -119,7 +121,7 @@ conf.set(HConstants.HEALTH_SCRIPT_LOC, healthScriptFile.getAbsolutePath()); conf.setLong(HConstants.HEALTH_FAILURE_THRESHOLD, 3); - conf.setLong(HConstants.HEALTH_SCRIPT_TIMEOUT, 100); + conf.setLong(HConstants.HEALTH_SCRIPT_TIMEOUT, 200); return conf; } Index: hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java (revision 1438951) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java (working copy) @@ -106,8 +106,6 @@ Leases leases = re.getRegionServerServices().getLeases(); leases.createLease("x", 2000, null); leases.cancelLease("x"); - Integer lid = re.getRegion().getLock(null, Bytes.toBytes("some row"), true); - re.getRegion().releaseRowLock(lid); } @Override Index: hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java =================================================================== --- hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java (revision 1438951) +++ hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java (working copy) @@ -22,6 +22,8 @@ import java.util.List; import java.util.ArrayList; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.*; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.fs.FSDataOutputStream; @@ -51,6 +53,7 @@ @Category(MediumTests.class) public class TestImportTsv { + private static final Log LOG = LogFactory.getLog(TestImportTsv.class); @Test public void testTsvParserSpecParsing() { @@ -266,7 +269,6 @@ args = opts.getRemainingArgs(); try { - FileSystem fs = FileSystem.get(conf); FSDataOutputStream op = fs.create(new Path(inputFile), true); if (data == null) { @@ -280,8 +282,11 @@ if (conf.get(ImportTsv.BULK_OUTPUT_CONF_KEY) == null) { HTableDescriptor desc = new HTableDescriptor(TAB); desc.addFamily(new HColumnDescriptor(FAM)); - new HBaseAdmin(conf).createTable(desc); + HBaseAdmin admin = new HBaseAdmin(conf); + admin.createTable(desc); + admin.close(); } else { // set the hbaseAdmin as we are not going through main() + LOG.info("set the hbaseAdmin"); ImportTsv.createHbaseAdmin(conf); } Job job = ImportTsv.createSubmittableJob(conf, args); @@ -323,6 +328,7 @@ // continue } } + table.close(); assertTrue(verified); } finally { htu1.shutdownMiniMapReduceCluster();