Index: src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java (revision 1438855) +++ src/test/java/org/apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java (working copy) @@ -107,8 +107,6 @@ Leases leases = re.getRegionServerServices().getLeases(); leases.createLease("x", null); leases.cancelLease("x"); - Integer lid = re.getRegion().getLock(null, Bytes.toBytes("some row"), true); - re.getRegion().releaseRowLock(lid); } @Override Index: src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java (revision 1438855) +++ src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java (working copy) @@ -47,6 +47,7 @@ import com.google.common.base.Splitter; import com.google.common.collect.Iterables; import org.junit.experimental.categories.Category; +import org.mortbay.log.Log; import static org.junit.Assert.*; @@ -185,7 +186,7 @@ // Cluster HBaseTestingUtility htu1 = new HBaseTestingUtility(); - MiniHBaseCluster cluster = htu1.startMiniCluster(); + htu1.startMiniCluster(); htu1.startMiniMapReduceCluster(); GenericOptionsParser opts = new GenericOptionsParser(htu1.getConfiguration(), args); @@ -193,7 +194,6 @@ args = opts.getRemainingArgs(); try { - FileSystem fs = FileSystem.get(conf); FSDataOutputStream op = fs.create(new Path(inputFile), true); String line = "KEY\u001bVALUE1\u001bVALUE2\n"; @@ -202,13 +202,14 @@ final byte[] FAM = Bytes.toBytes(family); final byte[] TAB = Bytes.toBytes(tableName); - final byte[] QA = Bytes.toBytes("A"); - final byte[] QB = Bytes.toBytes("B"); 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); @@ -250,6 +251,7 @@ // continue } } + table.close(); assertTrue(verified); } finally { htu1.shutdownMiniMapReduceCluster();