Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java (revision 577399) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/AbstractMergeTestBase.java (working copy) @@ -119,6 +119,9 @@ if (dfsCluster != null) { dfsCluster.shutdown(); } + if (fs != null) { + fs.close(); + } } private HRegion createAregion(Text startKey, Text endKey, int firstRow, Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java (revision 577399) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/MiniHBaseCluster.java (working copy) @@ -84,6 +84,9 @@ /** * Starts a MiniHBaseCluster on top of an existing HDFSCluster * + * Note that if you use this constructor, you should shut down the mini dfs + * cluster in your test case. + * * @param conf * @param nRegionNodes * @param dfsCluster @@ -93,7 +96,8 @@ MiniDFSCluster dfsCluster) throws IOException { this.conf = conf; - this.cluster = dfsCluster; + this.fs = dfsCluster.getFileSystem(); + this.cluster = null; init(nRegionNodes); } @@ -116,6 +120,10 @@ this.deleteOnExit = deleteOnExit; if (miniHdfsFilesystem) { this.cluster = new MiniDFSCluster(this.conf, 2, format, (String[])null); + this.fs = cluster.getFileSystem(); + } else { + this.cluster = null; + this.fs = FileSystem.get(conf); } init(nRegionNodes); } @@ -122,7 +130,6 @@ private void init(final int nRegionNodes) throws IOException { try { - this.fs = FileSystem.get(conf); this.parentdir = new Path(conf.get(HBASE_DIR, DEFAULT_HBASE_DIR)); fs.mkdirs(parentdir); this.masterThread = startMaster(this.conf); Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java (revision 577399) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/shell/TestHBaseShell.java (working copy) @@ -43,6 +43,7 @@ private ByteArrayOutputStream baos; private HBaseAdmin admin; + /** constructor */ public TestHBaseShell() { super(1 /*One region server only*/); } @@ -47,6 +48,7 @@ super(1 /*One region server only*/); } + /** {@inheritDoc} */ @Override public void setUp() throws Exception { super.setUp(); @@ -100,6 +102,9 @@ sglQuotedColumnFamily + "');", tmpTableName, sglQuotedColumnFamily); } + /** + * @throws Exception + */ public void testInsertSelectDelete() throws Exception { final String tableName = getName(); final String columnFamily = tableName; Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestBatchUpdate.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestBatchUpdate.java (revision 577399) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestBatchUpdate.java (working copy) @@ -40,6 +40,7 @@ * @throws UnsupportedEncodingException */ public TestBatchUpdate() throws UnsupportedEncodingException { + super(); value = "abcd".getBytes(HConstants.UTF8_ENCODING); } Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestDFSAbort.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestDFSAbort.java (revision 577399) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestDFSAbort.java (working copy) @@ -60,7 +60,10 @@ cluster.join(); } - public static void main(String[] args) { + /** + * @param args unused + */ + public static void main(@SuppressWarnings("unused") String[] args) { TestRunner.run(new TestSuite(TestDFSAbort.class)); } } Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner2.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner2.java (revision 577399) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestScanner2.java (working copy) @@ -177,7 +177,7 @@ HBaseAdmin admin = new HBaseAdmin(conf); Text tableName = new Text(getName()); admin.createTable(new HTableDescriptor(tableName.toString())); - List regions = scan(conf, metaTable); + List regions = scan(metaTable); assertEquals("Expected one region", regions.size(), 1); HRegionInfo region = regions.get(0); assertTrue("Expected region named for test", @@ -197,10 +197,10 @@ homedir, this.conf, null)); try { for (HRegion r : newRegions) { - addRegionToMETA(conf, metaTable, r, this.cluster.getHMasterAddress(), + addRegionToMETA(metaTable, r, this.cluster.getHMasterAddress(), -1L); } - regions = scan(conf, metaTable); + regions = scan(metaTable); assertEquals("Should be two regions only", 2, regions.size()); } finally { for (HRegion r : newRegions) { @@ -210,7 +210,7 @@ } } - private List scan(final Configuration conf, final HTable t) + private List scan(final HTable t) throws IOException { List regions = new ArrayList(); HRegionInterface regionServer = null; @@ -262,8 +262,7 @@ return regions; } - private void addRegionToMETA(final Configuration conf, - final HTable t, final HRegion region, + private void addRegionToMETA(final HTable t, final HRegion region, final HServerAddress serverAddress, final long startCode) throws IOException { Index: src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTableMapReduce.java =================================================================== --- src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTableMapReduce.java (revision 577399) +++ src/contrib/hbase/src/test/org/apache/hadoop/hbase/TestTableMapReduce.java (working copy) @@ -115,6 +115,10 @@ if (dfsCluster != null) { dfsCluster.shutdown(); } + + if (fs != null) { + fs.close(); + } } /** @@ -254,7 +258,7 @@ admin.createTable(desc); // Populate a table into multiple regions - MultiRegionTable.makeMultiRegionTable(conf, hCluster, null, + MultiRegionTable.makeMultiRegionTable(conf, hCluster, fs, MULTI_REGION_TABLE_NAME, INPUT_COLUMN); // Verify table indeed has multiple regions