http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java index 4471f76..b95b20a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java @@ -109,10 +109,10 @@ public class TestRegionServerMetrics { TEST_UTIL.createTable(tName, cfName); - new HTable(conf, tName).close(); //wait for the table to come up. + TEST_UTIL.getConnection().getTable(tName).close(); //wait for the table to come up. // Do a first put to be sure that the connection is established, meta is there and so on. - HTable table = new HTable(conf, tName); + HTable table = (HTable) TEST_UTIL.getConnection().getTable(tName); Put p = new Put(row); p.add(cfName, qualifier, initValue); table.put(p); @@ -189,9 +189,7 @@ public class TestRegionServerMetrics { metricsRegionServer.getRegionServerWrapper().forceRecompute(); - TEST_UTIL.createTable(tableName, cf); - - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.createTable(tableName, cf); Put p = new Put(row); p.add(cf, qualifier, val); @@ -219,10 +217,8 @@ public class TestRegionServerMetrics { long stores = metricsHelper.getGaugeLong("storeCount", serverSource); long storeFiles = metricsHelper.getGaugeLong("storeFileCount", serverSource); - TEST_UTIL.createTable(tableName, cf); - //Force a hfile. - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.createTable(tableName, cf); Put p = new Put(row); p.add(cf, qualifier, val); t.put(p); @@ -246,8 +242,7 @@ public class TestRegionServerMetrics { byte[] valTwo = Bytes.toBytes("ValueTwo"); byte[] valThree = Bytes.toBytes("ValueThree"); - TEST_UTIL.createTable(tableName, cf); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.createTable(tableName, cf); Put p = new Put(row); p.add(cf, qualifier, valOne); t.put(p); @@ -277,9 +272,7 @@ public class TestRegionServerMetrics { byte[] val = Bytes.toBytes(0l); - TEST_UTIL.createTable(tableName, cf); - Table t = new HTable(conf, tableName); - + Table t = TEST_UTIL.createTable(tableName, cf); Put p = new Put(row); p.add(cf, qualifier, val); t.put(p); @@ -306,9 +299,7 @@ public class TestRegionServerMetrics { byte[] val = Bytes.toBytes("One"); - TEST_UTIL.createTable(tableName, cf); - Table t = new HTable(conf, tableName); - + Table t = TEST_UTIL.createTable(tableName, cf); Put p = new Put(row); p.add(cf, qualifier, val); t.put(p); @@ -334,8 +325,7 @@ public class TestRegionServerMetrics { byte[] val = Bytes.toBytes("One"); - TEST_UTIL.createTable(tableName, cf); - HTable t = new HTable(conf, tableName); + HTable t = TEST_UTIL.createTable(tableName, cf); t.setAutoFlushTo(false); for (int insertCount =0; insertCount < 100; insertCount++) { Put p = new Put(Bytes.toBytes("" + insertCount + "row"));
http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java index 309efbf..c6c9f50 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSCVFWithMiniCluster.java @@ -83,7 +83,7 @@ public class TestSCVFWithMiniCluster { destroy(admin, HBASE_TABLE_NAME); create(admin, HBASE_TABLE_NAME, FAMILY_A, FAMILY_B); admin.close(); - htable = new HTable(util.getConfiguration(), HBASE_TABLE_NAME); + htable = util.getConnection().getTable(HBASE_TABLE_NAME); /* Add some values */ List<Put> puts = new ArrayList<Put>(); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java index 49ded21..bd5439a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestScannerWithBulkload.java @@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.TableNotFoundException; @@ -72,17 +73,17 @@ public class TestScannerWithBulkload { public void testBulkLoad() throws Exception { TableName tableName = TableName.valueOf("testBulkLoad"); long l = System.currentTimeMillis(); - HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration()); + HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); createTable(admin, tableName); Scan scan = createScan(); - final HTable table = init(admin, l, scan, tableName); + final Table table = init(admin, l, scan, tableName); // use bulkload final Path hfilePath = writeToHFile(l, "/temp/testBulkLoad/", "/temp/testBulkLoad/col/file", false); Configuration conf = TEST_UTIL.getConfiguration(); conf.setBoolean("hbase.mapreduce.bulkload.assign.sequenceNumbers", true); final LoadIncrementalHFiles bulkload = new LoadIncrementalHFiles(conf); - bulkload.doBulkLoad(hfilePath, table); + bulkload.doBulkLoad(hfilePath, (HTable) table); ResultScanner scanner = table.getScanner(scan); Result result = scanner.next(); result = scanAfterBulkLoad(scanner, result, "version2"); @@ -165,8 +166,8 @@ public class TestScannerWithBulkload { return hfilePath; } - private HTable init(HBaseAdmin admin, long l, Scan scan, TableName tableName) throws Exception { - HTable table = new HTable(TEST_UTIL.getConfiguration(), tableName); + private Table init(HBaseAdmin admin, long l, Scan scan, TableName tableName) throws Exception { + Table table = TEST_UTIL.getConnection().getTable(tableName); Put put0 = new Put(Bytes.toBytes("row1")); put0.add(new KeyValue(Bytes.toBytes("row1"), Bytes.toBytes("col"), Bytes.toBytes("q"), l, Bytes .toBytes("version0"))); @@ -200,10 +201,10 @@ public class TestScannerWithBulkload { public void testBulkLoadWithParallelScan() throws Exception { TableName tableName = TableName.valueOf("testBulkLoadWithParallelScan"); final long l = System.currentTimeMillis(); - HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration()); + HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); createTable(admin, tableName); Scan scan = createScan(); - final HTable table = init(admin, l, scan, tableName); + final Table table = init(admin, l, scan, tableName); // use bulkload final Path hfilePath = writeToHFile(l, "/temp/testBulkLoadWithParallelScan/", "/temp/testBulkLoadWithParallelScan/col/file", false); @@ -221,7 +222,7 @@ public class TestScannerWithBulkload { Bytes.toBytes("version0"))); table.put(put1); table.flushCommits(); - bulkload.doBulkLoad(hfilePath, table); + bulkload.doBulkLoad(hfilePath, (HTable) table); latch.countDown(); } catch (TableNotFoundException e) { } catch (IOException e) { @@ -242,17 +243,17 @@ public class TestScannerWithBulkload { public void testBulkLoadNativeHFile() throws Exception { TableName tableName = TableName.valueOf("testBulkLoadNativeHFile"); long l = System.currentTimeMillis(); - HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration()); + HBaseAdmin admin = TEST_UTIL.getHBaseAdmin(); createTable(admin, tableName); Scan scan = createScan(); - final HTable table = init(admin, l, scan, tableName); + final Table table = init(admin, l, scan, tableName); // use bulkload final Path hfilePath = writeToHFile(l, "/temp/testBulkLoadNativeHFile/", "/temp/testBulkLoadNativeHFile/col/file", true); Configuration conf = TEST_UTIL.getConfiguration(); conf.setBoolean("hbase.mapreduce.bulkload.assign.sequenceNumbers", true); final LoadIncrementalHFiles bulkload = new LoadIncrementalHFiles(conf); - bulkload.doBulkLoad(hfilePath, table); + bulkload.doBulkLoad(hfilePath, (HTable) table); ResultScanner scanner = table.getScanner(scan); Result result = scanner.next(); // We had 'version0', 'version1' for 'row1,col:q' in the table. http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java index c6c3cb7..f5cf33d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java @@ -185,7 +185,7 @@ public class TestServerCustomProtocol { @Test public void testSingleProxy() throws Throwable { - Table table = new HTable(util.getConfiguration(), TEST_TABLE); + Table table = util.getConnection().getTable(TEST_TABLE); Map<byte [], String> results = ping(table, null, null); // There are three regions so should get back three results. assertEquals(3, results.size()); @@ -308,7 +308,7 @@ public class TestServerCustomProtocol { @Test public void testSingleMethod() throws Throwable { - try (HTable table = new HTable(util.getConfiguration(), TEST_TABLE)) { + try (HTable table = (HTable) util.getConnection().getTable(TEST_TABLE)) { RegionLocator locator = table.getRegionLocator(); Map<byte [], String> results = table.coprocessorService(PingProtos.PingService.class, null, ROW_A, @@ -337,7 +337,7 @@ public class TestServerCustomProtocol { @Test public void testRowRange() throws Throwable { - try (HTable table = new HTable(util.getConfiguration(), TEST_TABLE)) { + try (HTable table = (HTable) util.getConnection().getTable(TEST_TABLE)) { RegionLocator locator = table.getRegionLocator(); for (Entry<HRegionInfo, ServerName> e: table.getRegionLocations().entrySet()) { LOG.info("Region " + e.getKey().getRegionNameAsString() + ", servername=" + e.getValue()); @@ -417,7 +417,7 @@ public class TestServerCustomProtocol { @Test public void testCompoundCall() throws Throwable { - try (HTable table = new HTable(util.getConfiguration(), TEST_TABLE)) { + try (HTable table = (HTable) util.getConnection().getTable(TEST_TABLE)) { RegionLocator locator = table.getRegionLocator(); Map<byte [], String> results = compoundOfHelloAndPing(table, ROW_A, ROW_C); verifyRegionResults(locator, results, "Hello, pong", ROW_A); @@ -428,7 +428,7 @@ public class TestServerCustomProtocol { @Test public void testNullCall() throws Throwable { - try(HTable table = new HTable(util.getConfiguration(), TEST_TABLE)) { + try(HTable table = (HTable) util.getConnection().getTable(TEST_TABLE)) { RegionLocator locator = table.getRegionLocator(); Map<byte[],String> results = hello(table, null, ROW_A, ROW_C); verifyRegionResults(locator, results, "Who are you?", ROW_A); @@ -439,7 +439,7 @@ public class TestServerCustomProtocol { @Test public void testNullReturn() throws Throwable { - try (HTable table = new HTable(util.getConfiguration(), TEST_TABLE)) { + try (HTable table = (HTable) util.getConnection().getTable(TEST_TABLE)) { RegionLocator locator = table.getRegionLocator(); Map<byte[],String> results = hello(table, "nobody", ROW_A, ROW_C); verifyRegionResults(locator, results, null, ROW_A); @@ -450,7 +450,7 @@ public class TestServerCustomProtocol { @Test public void testEmptyReturnType() throws Throwable { - try (HTable table = new HTable(util.getConfiguration(), TEST_TABLE)) { + try (HTable table = (HTable) util.getConnection().getTable(TEST_TABLE)) { Map<byte[],String> results = noop(table, ROW_A, ROW_C); assertEquals("Should have results from three regions", 3, results.size()); // all results should be null http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java index 0d574f6..bd66b39 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitTransactionOnCluster.java @@ -137,7 +137,7 @@ public class TestSplitTransactionOnCluster { @Before public void setup() throws IOException { TESTING_UTIL.ensureSomeNonStoppedRegionServersAvailable(NB_SERVERS); - this.admin = new HBaseAdmin(TESTING_UTIL.getConfiguration()); + this.admin = TESTING_UTIL.getHBaseAdmin(); this.cluster = TESTING_UTIL.getMiniHBaseCluster(); } @@ -224,8 +224,6 @@ public class TestSplitTransactionOnCluster { @Test(timeout = 60000) public void testSplitFailedCompactionAndSplit() throws Exception { final TableName tableName = TableName.valueOf("testSplitFailedCompactionAndSplit"); - Configuration conf = TESTING_UTIL.getConfiguration(); - HBaseAdmin admin = new HBaseAdmin(conf); // Create table then get the single region for our new table. HTableDescriptor htd = new HTableDescriptor(tableName); byte[] cf = Bytes.toBytes("cf"); @@ -242,7 +240,7 @@ public class TestSplitTransactionOnCluster { int regionServerIndex = cluster.getServerWith(region.getRegionName()); HRegionServer regionServer = cluster.getRegionServer(regionServerIndex); - Table t = new HTable(conf, tableName); + Table t = TESTING_UTIL.getConnection().getTable(tableName); // insert data insertData(tableName, admin, t); insertData(tableName, admin, t); @@ -480,7 +478,7 @@ public class TestSplitTransactionOnCluster { HColumnDescriptor hcd = new HColumnDescriptor("col"); htd.addFamily(hcd); admin.createTable(htd); - Table table = new HTable(conf, userTableName); + Table table = TESTING_UTIL.getConnection().getTable(userTableName); try { for (int i = 0; i <= 5; i++) { String row = "row" + i; @@ -590,7 +588,7 @@ public class TestSplitTransactionOnCluster { HMaster master = abortAndWaitForMaster(); - this.admin = new HBaseAdmin(TESTING_UTIL.getConfiguration()); + this.admin = TESTING_UTIL.getHBaseAdmin(); // Update the region to be offline and split, so that HRegionInfo#equals // returns true in checking rebuilt region states map. @@ -927,8 +925,8 @@ public class TestSplitTransactionOnCluster { Table table1 = null; Table table2 = null; try { - table1 = new HTable(TESTING_UTIL.getConfiguration(), firstTable); - table2 = new HTable(TESTING_UTIL.getConfiguration(), firstTable); + table1 = TESTING_UTIL.getConnection().getTable(firstTable); + table2 = TESTING_UTIL.getConnection().getTable(firstTable); insertData(firstTable, admin, table1); insertData(secondTable, admin, table2); admin.split(firstTable, "row2".getBytes()); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java index eaea83e..14c6ca9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java @@ -119,7 +119,7 @@ public class TestTags { Admin admin = TEST_UTIL.getHBaseAdmin(); admin.createTable(desc); byte[] value = Bytes.toBytes("value"); - table = new HTable(TEST_UTIL.getConfiguration(), tableName); + table = TEST_UTIL.getConnection().getTable(tableName); Put put = new Put(row); put.add(fam, qual, HConstants.LATEST_TIMESTAMP, value); put.setAttribute("visibility", Bytes.toBytes("myTag")); @@ -185,7 +185,7 @@ public class TestTags { Admin admin = TEST_UTIL.getHBaseAdmin(); admin.createTable(desc); - table = new HTable(TEST_UTIL.getConfiguration(), tableName); + table = TEST_UTIL.getConnection().getTable(tableName); Put put = new Put(row); byte[] value = Bytes.toBytes("value"); put.add(fam, qual, HConstants.LATEST_TIMESTAMP, value); @@ -275,7 +275,7 @@ public class TestTags { Admin admin = TEST_UTIL.getHBaseAdmin(); admin.createTable(desc); try { - table = new HTable(TEST_UTIL.getConfiguration(), tableName); + table = TEST_UTIL.getConnection().getTable(tableName); Put put = new Put(row); byte[] value = Bytes.toBytes("value"); put.add(fam, qual, HConstants.LATEST_TIMESTAMP, value); @@ -388,7 +388,7 @@ public class TestTags { Table table = null; try { - table = new HTable(TEST_UTIL.getConfiguration(), tableName); + table = TEST_UTIL.getConnection().getTable(tableName); Put put = new Put(row1); byte[] v = Bytes.toBytes(2L); put.add(f, q, v); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java index b4cb213..4e07040 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollAbort.java @@ -128,8 +128,7 @@ public class TestLogRollAbort { LOG.info("Starting testRSAbortWithUnflushedEdits()"); // When the hbase:meta table can be opened, the region servers are running - new HTable(TEST_UTIL.getConfiguration(), - TableName.META_TABLE_NAME).close(); + TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME).close(); // Create the test table and open it TableName tableName = TableName.valueOf(this.getClass().getSimpleName()); @@ -137,9 +136,8 @@ public class TestLogRollAbort { desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY)); admin.createTable(desc); - Table table = new HTable(TEST_UTIL.getConfiguration(), desc.getTableName()); + Table table = TEST_UTIL.getConnection().getTable(desc.getTableName()); try { - HRegionServer server = TEST_UTIL.getRSForFirstRegionInTable(tableName); WAL log = server.getWAL(null); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java index cdbdf6f..5216ee5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollPeriod.java @@ -77,7 +77,7 @@ public class TestLogRollPeriod { TableName tableName = TableName.valueOf("TestLogRollPeriodNoEdits"); TEST_UTIL.createTable(tableName, "cf"); try { - Table table = new HTable(TEST_UTIL.getConfiguration(), tableName); + Table table = TEST_UTIL.getConnection().getTable(tableName); try { HRegionServer server = TEST_UTIL.getRSForFirstRegionInTable(tableName); WAL log = server.getWAL(null); @@ -102,7 +102,7 @@ public class TestLogRollPeriod { try { HRegionServer server = TEST_UTIL.getRSForFirstRegionInTable(tableName); WAL log = server.getWAL(null); - final Table table = new HTable(TEST_UTIL.getConfiguration(), tableName); + final Table table = TEST_UTIL.getConnection().getTable(tableName); Thread writerThread = new Thread("writer") { @Override http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java index 86e77ad..1da3662 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java @@ -172,7 +172,7 @@ public class TestLogRolling { private void startAndWriteData() throws IOException, InterruptedException { // When the hbase:meta table can be opened, the region servers are running - new HTable(TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME); + TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME); this.server = cluster.getRegionServerThreads().get(0).getRegionServer(); Table table = createTestTable(this.tableName); @@ -311,7 +311,7 @@ public class TestLogRolling { desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY)); admin.createTable(desc); - Table table = new HTable(TEST_UTIL.getConfiguration(), desc.getTableName()); + Table table = TEST_UTIL.getConnection().getTable(desc.getTableName()); assertTrue(table.isAutoFlush()); server = TEST_UTIL.getRSForFirstRegionInTable(desc.getTableName()); @@ -420,7 +420,7 @@ public class TestLogRolling { LOG.info("Replication=" + fs.getDefaultReplication(TEST_UTIL.getDataTestDirOnTestFS())); // When the hbase:meta table can be opened, the region servers are running - Table t = new HTable(TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME); + Table t = TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME); try { this.server = cluster.getRegionServer(0); @@ -429,7 +429,7 @@ public class TestLogRolling { desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY)); admin.createTable(desc); - HTable table = new HTable(TEST_UTIL.getConfiguration(), desc.getTableName()); + Table table = TEST_UTIL.getConnection().getTable(desc.getTableName()); server = TEST_UTIL.getRSForFirstRegionInTable(desc.getTableName()); final WAL log = server.getWAL(null); @@ -569,7 +569,7 @@ public class TestLogRolling { Table table2 = null; // When the hbase:meta table can be opened, the region servers are running - Table t = new HTable(TEST_UTIL.getConfiguration(), TableName.META_TABLE_NAME); + Table t = TEST_UTIL.getConnection().getTable(TableName.META_TABLE_NAME); try { table = createTestTable(getName()); table2 = createTestTable(getName() + "1"); @@ -635,7 +635,7 @@ public class TestLogRolling { HTableDescriptor desc = new HTableDescriptor(TableName.valueOf(tableName)); desc.addFamily(new HColumnDescriptor(HConstants.CATALOG_FAMILY)); admin.createTable(desc); - return new HTable(TEST_UTIL.getConfiguration(), desc.getTableName()); + return TEST_UTIL.getConnection().getTable(desc.getTableName()); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java index 6cdfe3b..c441969 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java @@ -186,7 +186,7 @@ public class TestWALReplay { byte[] value = Bytes.toBytes("testV"); byte[][] familys = { family1, family2 }; TEST_UTIL.createTable(tableName, familys); - Table htable = new HTable(TEST_UTIL.getConfiguration(), tableName); + Table htable = TEST_UTIL.getConnection().getTable(tableName); Put put = new Put(Bytes.toBytes("r1")); put.add(family1, qualifier, value); htable.put(put); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java index f9aeb6f..b30820b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java @@ -131,14 +131,14 @@ public class TestMultiSlaveReplication { utility3.startMiniCluster(); ReplicationAdmin admin1 = new ReplicationAdmin(conf1); - new HBaseAdmin(conf1).createTable(table); - new HBaseAdmin(conf2).createTable(table); - new HBaseAdmin(conf3).createTable(table); - Table htable1 = new HTable(conf1, tableName); + utility1.getHBaseAdmin().createTable(table); + utility2.getHBaseAdmin().createTable(table); + utility3.getHBaseAdmin().createTable(table); + Table htable1 = utility1.getConnection().getTable(tableName); htable1.setWriteBufferSize(1024); - Table htable2 = new HTable(conf2, tableName); + Table htable2 = utility2.getConnection().getTable(tableName); htable2.setWriteBufferSize(1024); - Table htable3 = new HTable(conf3, tableName); + Table htable3 = utility3.getConnection().getTable(tableName); htable3.setWriteBufferSize(1024); admin1.addPeer("1", utility2.getClusterKey()); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java index 67f2031..7ca9fed 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationChangingPeerRegionservers.java @@ -119,7 +119,7 @@ public class TestReplicationChangingPeerRegionservers extends TestReplicationBas Put put = new Put(row); put.add(famName, row, row); - htable1 = new HTable(conf1, tableName); + htable1 = utility1.getConnection().getTable(tableName); htable1.put(put); Get get = new Get(row); @@ -136,7 +136,5 @@ public class TestReplicationChangingPeerRegionservers extends TestReplicationBas break; } } - } - } http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java index 9a3b581..bfb01db 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSmallTests.java @@ -116,7 +116,7 @@ public class TestReplicationSmallTests extends TestReplicationBase { final byte[] v1 = Bytes.toBytes("v1"); final byte[] v2 = Bytes.toBytes("v2"); final byte[] v3 = Bytes.toBytes("v3"); - htable1 = new HTable(conf1, tableName); + htable1 = utility1.getConnection().getTable(tableName); long t = EnvironmentEdgeManager.currentTime(); // create three versions for "row" @@ -203,7 +203,7 @@ public class TestReplicationSmallTests extends TestReplicationBase { Put put = new Put(row); put.add(famName, row, row); - htable1 = new HTable(conf1, tableName); + htable1 = utility1.getConnection().getTable(tableName); htable1.put(put); Get get = new Get(row); @@ -519,7 +519,7 @@ public class TestReplicationSmallTests extends TestReplicationBase { final String colFam = "cf1"; final int numOfTables = 3; - HBaseAdmin hadmin = new HBaseAdmin(conf1); + HBaseAdmin hadmin = utility1.getHBaseAdmin(); // Create Tables for (int i = 0; i < numOfTables; i++) { http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java index 58eb19f..26acdab 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationSyncUpTool.java @@ -17,29 +17,33 @@ */ package org.apache.hadoop.hbase.replication; -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.hadoop.hbase.*; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HColumnDescriptor; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Delete; -import org.apache.hadoop.hbase.client.HBaseAdmin; -import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.replication.ReplicationAdmin; +import org.apache.hadoop.hbase.replication.regionserver.ReplicationSyncUp; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.testclassification.ReplicationTests; import org.apache.hadoop.hbase.util.Bytes; -import org.apache.hadoop.hbase.replication.regionserver.ReplicationSyncUp; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; + @Category({ReplicationTests.class, LargeTests.class}) public class TestReplicationSyncUpTool extends TestReplicationBase { @@ -179,26 +183,29 @@ public class TestReplicationSyncUpTool extends TestReplicationBase { ReplicationAdmin admin1 = new ReplicationAdmin(conf1); ReplicationAdmin admin2 = new ReplicationAdmin(conf2); - Admin ha = new HBaseAdmin(conf1); + Admin ha = utility1.getHBaseAdmin(); ha.createTable(t1_syncupSource); ha.createTable(t2_syncupSource); ha.close(); - ha = new HBaseAdmin(conf2); + ha = utility2.getHBaseAdmin(); ha.createTable(t1_syncupTarget); ha.createTable(t2_syncupTarget); ha.close(); + Connection connection1 = ConnectionFactory.createConnection(utility1.getConfiguration()); + Connection connection2 = ConnectionFactory.createConnection(utility2.getConfiguration()); + // Get HTable from Master - ht1Source = new HTable(conf1, t1_su); + ht1Source = connection1.getTable(t1_su); ht1Source.setWriteBufferSize(1024); - ht2Source = new HTable(conf1, t2_su); + ht2Source = connection1.getTable(t2_su); ht1Source.setWriteBufferSize(1024); // Get HTable from Peer1 - ht1TargetAtPeer1 = new HTable(conf2, t1_su); + ht1TargetAtPeer1 = connection2.getTable(t1_su); ht1TargetAtPeer1.setWriteBufferSize(1024); - ht2TargetAtPeer1 = new HTable(conf2, t2_su); + ht2TargetAtPeer1 = connection2.getTable(t2_su); ht2TargetAtPeer1.setWriteBufferSize(1024); /** http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java index fc06d15..adf3c0e 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWithTags.java @@ -150,9 +150,9 @@ public class TestReplicationWithTags { Admin admin = conn.getAdmin()) { admin.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); } - htable1 = new HTable(conf1, TABLE_NAME); + htable1 = utility1.getConnection().getTable(TABLE_NAME); htable1.setWriteBufferSize(1024); - htable2 = new HTable(conf2, TABLE_NAME); + htable2 = utility2.getConnection().getTable(TABLE_NAME); } /** @@ -171,7 +171,7 @@ public class TestReplicationWithTags { put.setAttribute("visibility", Bytes.toBytes("myTag3")); put.add(FAMILY, ROW, ROW); - htable1 = new HTable(conf1, TABLE_NAME); + htable1 = utility1.getConnection().getTable(TABLE_NAME); htable1.put(put); Get get = new Get(ROW); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java index 2eec09d..d6a6f03 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java @@ -29,6 +29,8 @@ import java.util.UUID; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.testclassification.SecurityTests; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.hbase.TableName; @@ -123,7 +125,8 @@ public class TestAccessControlFilter extends SecureTestUtil { Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TABLE); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TABLE); try { ResultScanner rs = t.getScanner(new Scan()); int rowcnt = 0; @@ -139,6 +142,7 @@ public class TestAccessControlFilter extends SecureTestUtil { return null; } finally { t.close(); + connection.close(); } } }); @@ -149,7 +153,8 @@ public class TestAccessControlFilter extends SecureTestUtil { Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TABLE); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TABLE); try { ResultScanner rs = t.getScanner(new Scan()); int rowcnt = 0; @@ -164,6 +169,7 @@ public class TestAccessControlFilter extends SecureTestUtil { return null; } finally { t.close(); + connection.close(); } } }); @@ -174,7 +180,8 @@ public class TestAccessControlFilter extends SecureTestUtil { Configuration conf = new Configuration(TEST_UTIL.getConfiguration()); // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TABLE); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TABLE); try { ResultScanner rs = t.getScanner(new Scan()); int rowcnt = 0; @@ -189,6 +196,7 @@ public class TestAccessControlFilter extends SecureTestUtil { return null; } finally { t.close(); + connection.close(); } } }); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java index 27ee915..b8f41c4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java @@ -705,7 +705,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Get g = new Get(TEST_ROW); g.addFamily(TEST_FAMILY); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { t.get(g); } finally { @@ -723,7 +723,7 @@ public class TestAccessController extends SecureTestUtil { Scan s = new Scan(); s.addFamily(TEST_FAMILY); - Table table = new HTable(conf, TEST_TABLE.getTableName()); + Table table = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { ResultScanner scanner = table.getScanner(s); try { @@ -752,7 +752,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Put p = new Put(TEST_ROW); p.add(TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes(1)); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { t.put(p); } finally { @@ -769,7 +769,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Delete d = new Delete(TEST_ROW); d.deleteFamily(TEST_FAMILY); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { t.delete(d); } finally { @@ -786,7 +786,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Increment inc = new Increment(TEST_ROW); inc.addColumn(TEST_FAMILY, TEST_QUALIFIER, 1); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { t.increment(inc); } finally { @@ -806,7 +806,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Delete d = new Delete(TEST_ROW); d.deleteFamily(TEST_FAMILY); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { t.checkAndDelete(TEST_ROW, TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes("test_value"), d); @@ -824,7 +824,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Put p = new Put(TEST_ROW); p.add(TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes(1)); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { t.checkAndPut(TEST_ROW, TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes("test_value"), p); @@ -960,7 +960,7 @@ public class TestAccessController extends SecureTestUtil { put.add(TEST_FAMILY, qualifier, Bytes.toBytes(1)); Append append = new Append(row); append.add(TEST_FAMILY, qualifier, Bytes.toBytes(2)); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { t.put(put); t.append(append); @@ -980,7 +980,8 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction grantAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Connection connection = ConnectionFactory.createConnection(conf); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(TEST_TABLE.getTableName().getName()); AccessControlService.BlockingInterface protocol = @@ -989,6 +990,7 @@ public class TestAccessController extends SecureTestUtil { TEST_FAMILY, null, Action.READ); } finally { acl.close(); + connection.close(); } return null; } @@ -997,7 +999,8 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction revokeAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Connection connection = ConnectionFactory.createConnection(conf); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(TEST_TABLE.getTableName().getName()); AccessControlService.BlockingInterface protocol = @@ -1006,6 +1009,7 @@ public class TestAccessController extends SecureTestUtil { TEST_FAMILY, null, Action.READ); } finally { acl.close(); + connection.close(); } return null; } @@ -1014,7 +1018,8 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction getTablePermissionsAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Connection connection = ConnectionFactory.createConnection(conf); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(TEST_TABLE.getTableName().getName()); AccessControlService.BlockingInterface protocol = @@ -1022,6 +1027,7 @@ public class TestAccessController extends SecureTestUtil { ProtobufUtil.getUserPermissions(protocol, TEST_TABLE.getTableName()); } finally { acl.close(); + connection.close(); } return null; } @@ -1030,7 +1036,8 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction getGlobalPermissionsAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Connection connection = ConnectionFactory.createConnection(conf); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = @@ -1038,6 +1045,7 @@ public class TestAccessController extends SecureTestUtil { ProtobufUtil.getUserPermissions(protocol); } finally { acl.close(); + connection.close(); } return null; } @@ -1090,7 +1098,7 @@ public class TestAccessController extends SecureTestUtil { Put p = new Put(Bytes.toBytes("a")); p.add(family1, qualifier, Bytes.toBytes("v1")); p.add(family2, qualifier, Bytes.toBytes("v2")); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.put(p); } finally { @@ -1105,7 +1113,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Put p = new Put(Bytes.toBytes("a")); p.add(family1, qualifier, Bytes.toBytes("v1")); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.put(p); } finally { @@ -1120,7 +1128,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Put p = new Put(Bytes.toBytes("a")); p.add(family2, qualifier, Bytes.toBytes("v2")); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.put(p); } finally { @@ -1136,7 +1144,7 @@ public class TestAccessController extends SecureTestUtil { Get g = new Get(TEST_ROW); g.addFamily(family1); g.addFamily(family2); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.get(g); } finally { @@ -1151,7 +1159,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Get g = new Get(TEST_ROW); g.addFamily(family1); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.get(g); } finally { @@ -1166,7 +1174,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Get g = new Get(TEST_ROW); g.addFamily(family2); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.get(g); } finally { @@ -1182,7 +1190,7 @@ public class TestAccessController extends SecureTestUtil { Delete d = new Delete(TEST_ROW); d.deleteFamily(family1); d.deleteFamily(family2); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.delete(d); } finally { @@ -1197,7 +1205,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Delete d = new Delete(TEST_ROW); d.deleteFamily(family1); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.delete(d); } finally { @@ -1212,7 +1220,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Delete d = new Delete(TEST_ROW); d.deleteFamily(family2); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.delete(d); } finally { @@ -1360,7 +1368,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Get g = new Get(TEST_ROW); g.addColumn(family1, qualifier); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.get(g); } finally { @@ -1375,7 +1383,7 @@ public class TestAccessController extends SecureTestUtil { public Object run() throws Exception { Put p = new Put(TEST_ROW); p.add(family1, qualifier, Bytes.toBytes("v1")); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.put(p); } finally { @@ -1391,7 +1399,7 @@ public class TestAccessController extends SecureTestUtil { Delete d = new Delete(TEST_ROW); d.deleteColumn(family1, qualifier); // d.deleteFamily(family1); - Table t = new HTable(conf, tableName); + Table t = TEST_UTIL.getConnection().getTable(tableName); try { t.delete(d); } finally { @@ -1470,7 +1478,7 @@ public class TestAccessController extends SecureTestUtil { List<UserPermission> perms; - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Table acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = @@ -1497,7 +1505,7 @@ public class TestAccessController extends SecureTestUtil { grantOnTable(TEST_UTIL, user.getShortName(), tableName, family1, qualifier, Permission.Action.READ); - acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = @@ -1522,7 +1530,7 @@ public class TestAccessController extends SecureTestUtil { tableName, family1, qualifier, Permission.Action.WRITE, Permission.Action.READ); - acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = @@ -1541,7 +1549,7 @@ public class TestAccessController extends SecureTestUtil { revokeFromTable(TEST_UTIL, user.getShortName(), tableName, family1, qualifier, Permission.Action.WRITE, Permission.Action.READ); - acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = @@ -1561,7 +1569,7 @@ public class TestAccessController extends SecureTestUtil { htd.setOwner(newOwner); admin.modifyTable(tableName, htd); - acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(tableName.getName()); AccessControlService.BlockingInterface protocol = @@ -1583,7 +1591,7 @@ public class TestAccessController extends SecureTestUtil { @Test public void testGlobalPermissionList() throws Exception { List<UserPermission> perms; - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Table acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = @@ -1618,7 +1626,7 @@ public class TestAccessController extends SecureTestUtil { AccessControlProtos.GlobalPermission.newBuilder() .addAction(ProtobufUtil.toPermissionAction(a)).build())); } - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Table acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel channel = acl.coprocessorService(new byte[0]); AccessControlService.BlockingInterface protocol = @@ -1648,7 +1656,7 @@ public class TestAccessController extends SecureTestUtil { for (Permission p : perms) { request.addPermission(ProtobufUtil.toPermission(p)); } - Table acl = new HTable(conf, table); + Table acl = TEST_UTIL.getConnection().getTable(table); try { AccessControlService.BlockingInterface protocol = AccessControlService.newBlockingStub(acl.coprocessorService(new byte[0])); @@ -1798,7 +1806,7 @@ public class TestAccessController extends SecureTestUtil { .setTableName(ProtobufUtil.toProtoTableName(TEST_TABLE.getTableName())) .addAction(AccessControlProtos.Permission.Action.CREATE)) ).build(); - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Table acl = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel channel = acl.coprocessorService(new byte[0]); AccessControlService.BlockingInterface protocol = @@ -2160,7 +2168,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction getAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { return t.get(new Get(TEST_ROW)); } finally { @@ -2187,7 +2195,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction getAction = new AccessTestAction() { @Override public Object run() throws Exception { - HTable t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { return t.get(new Get(TEST_ROW)); } finally { @@ -2229,7 +2237,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction getAction = new AccessTestAction() { @Override public Object run() throws Exception { - HTable t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { return t.get(new Get(TEST_ROW)); } finally { @@ -2270,7 +2278,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction getAction = new AccessTestAction() { @Override public Object run() throws Exception { - HTable t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { return t.get(new Get(TEST_ROW)); } finally { @@ -2375,7 +2383,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction execEndpointAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { BlockingRpcChannel service = t.coprocessorService(HConstants.EMPTY_BYTE_ARRAY); PingCoprocessor.newBlockingStub(service).noop(null, NoopRequest.newBuilder().build()); @@ -2404,7 +2412,7 @@ public class TestAccessController extends SecureTestUtil { AccessTestAction putWithReservedTag = new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { KeyValue kv = new KeyValue(TEST_ROW, TEST_FAMILY, TEST_QUALIFIER, HConstants.LATEST_TIMESTAMP, HConstants.EMPTY_BYTE_ARRAY, http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java index 2bde357..f6066ad 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController2.java @@ -35,6 +35,7 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.ResultScanner; import org.apache.hadoop.hbase.client.Scan; +import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.access.Permission.Action; import org.apache.hadoop.hbase.testclassification.LargeTests; @@ -164,7 +165,7 @@ public class TestAccessController2 extends SecureTestUtil { AccessTestAction writeAction = new AccessTestAction() { @Override public Object run() throws Exception { - HTable t = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Table t = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { t.put(new Put(TEST_ROW).add(AccessControlLists.ACL_LIST_FAMILY, TEST_QUALIFIER, TEST_VALUE)); @@ -187,7 +188,7 @@ public class TestAccessController2 extends SecureTestUtil { AccessTestAction scanAction = new AccessTestAction() { @Override public Object run() throws Exception { - HTable t = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Table t = TEST_UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { ResultScanner s = t.getScanner(new Scan()); try { http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java index 3a8d662..e239647 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLWithMultipleVersions.java @@ -154,7 +154,8 @@ public class TestCellACLWithMultipleVersions extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Put p; // with ro ACL @@ -176,6 +177,7 @@ public class TestCellACLWithMultipleVersions extends SecureTestUtil { t.put(p); } finally { t.close(); + connection.close(); } return null; } @@ -188,11 +190,13 @@ public class TestCellACLWithMultipleVersions extends SecureTestUtil { public Object run() throws Exception { Get get = new Get(TEST_ROW); get.setMaxVersions(10); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { return t.get(get).listCells(); } finally { t.close(); + connection.close(); } } }; @@ -202,11 +206,13 @@ public class TestCellACLWithMultipleVersions extends SecureTestUtil { public Object run() throws Exception { Get get = new Get(TEST_ROW); get.setMaxVersions(10); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { return t.get(get).listCells(); } finally { t.close(); + connection.close(); } } }; @@ -219,7 +225,8 @@ public class TestCellACLWithMultipleVersions extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Put p; p = new Put(TEST_ROW).add(TEST_FAMILY1, TEST_Q1, ZERO); @@ -233,6 +240,7 @@ public class TestCellACLWithMultipleVersions extends SecureTestUtil { t.put(p); } finally { t.close(); + connection.close(); } return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java index 4bc819e..b7cbc52 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCellACLs.java @@ -31,6 +31,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; @@ -145,7 +147,8 @@ public class TestCellACLs extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Put p; // with ro ACL @@ -163,6 +166,7 @@ public class TestCellACLs extends SecureTestUtil { t.put(p); } finally { t.close(); + connection.close(); } return null; } @@ -174,11 +178,13 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Get get = new Get(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q1); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { return t.get(get).listCells(); } finally { t.close(); + connection.close(); } } }; @@ -187,11 +193,13 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Get get = new Get(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q2); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { return t.get(get).listCells(); } finally { t.close(); + connection.close(); } } }; @@ -200,11 +208,13 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Get get = new Get(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q3); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { return t.get(get).listCells(); } finally { t.close(); + connection.close(); } } }; @@ -213,7 +223,8 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Get get = new Get(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q4); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { return t.get(get).listCells(); } finally { @@ -245,7 +256,8 @@ public class TestCellACLs extends SecureTestUtil { scan.setStartRow(TEST_ROW); scan.setStopRow(Bytes.add(TEST_ROW, new byte[]{ 0 } )); scan.addFamily(TEST_FAMILY); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { ResultScanner scanner = t.getScanner(scan); Result result = null; @@ -257,6 +269,7 @@ public class TestCellACLs extends SecureTestUtil { } while (result != null); } finally { t.close(); + connection.close(); } return scanResults; } @@ -278,11 +291,13 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Increment i = new Increment(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q1, 1L); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { t.increment(i); } finally { t.close(); + connection.close(); } return null; } @@ -292,11 +307,13 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Increment i = new Increment(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q2, 1L); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { t.increment(i); } finally { t.close(); + connection.close(); } return null; } @@ -308,11 +325,13 @@ public class TestCellACLs extends SecureTestUtil { Increment i = new Increment(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q2, 1L); // Tag this increment with an ACL that denies write permissions to USER_OTHER i.setACL(USER_OTHER.getShortName(), new Permission(Action.READ)); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { t.increment(i); } finally { t.close(); + connection.close(); } return null; } @@ -322,11 +341,13 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Increment i = new Increment(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q3, 1L); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { t.increment(i); } finally { t.close(); + connection.close(); } return null; } @@ -349,11 +370,13 @@ public class TestCellACLs extends SecureTestUtil { @Override public Object run() throws Exception { Delete delete = new Delete(TEST_ROW).deleteFamily(TEST_FAMILY); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { t.delete(delete); } finally { t.close(); + connection.close(); } return null; } @@ -362,12 +385,14 @@ public class TestCellACLs extends SecureTestUtil { AccessTestAction deleteQ1 = new AccessTestAction() { @Override public Object run() throws Exception { - Delete delete = new Delete(TEST_ROW).deleteColumn(TEST_FAMILY, TEST_Q1); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Delete delete = new Delete(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q1); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { t.delete(delete); } finally { t.close(); + connection.close(); } return null; } @@ -394,7 +419,7 @@ public class TestCellACLs extends SecureTestUtil { verifyDenied(new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { Put p; p = new Put(TEST_ROW).add(TEST_FAMILY, TEST_Q1, ZERO); @@ -410,7 +435,7 @@ public class TestCellACLs extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { Put p; p = new Put(TEST_ROW).add(TEST_FAMILY, TEST_Q1, ZERO); @@ -426,7 +451,7 @@ public class TestCellACLs extends SecureTestUtil { verifyDenied(new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { Put p; p = new Put(TEST_ROW).add(TEST_FAMILY, TEST_Q1, ONE); @@ -442,7 +467,7 @@ public class TestCellACLs extends SecureTestUtil { verifyAllowed(new AccessTestAction() { @Override public Object run() throws Exception { - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Table t = TEST_UTIL.getConnection().getTable(TEST_TABLE.getTableName()); try { return t.get(new Get(TEST_ROW).addColumn(TEST_FAMILY, TEST_Q1)); } finally { http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java index 3270247..887b56d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java @@ -157,7 +157,7 @@ public class TestNamespaceCommands extends SecureTestUtil { @Test public void testAclTableEntries() throws Exception { String userTestNamespace = "userTestNsp"; - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Table acl = UTIL.getConnection().getTable(AccessControlLists.ACL_TABLE_NAME); try { ListMultimap<String, TablePermission> perms = AccessControlLists.getNamespacePermissions(conf, TEST_NAMESPACE); @@ -360,7 +360,8 @@ public class TestNamespaceCommands extends SecureTestUtil { AccessTestAction grantAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Connection connection = ConnectionFactory.createConnection(conf); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); @@ -369,6 +370,7 @@ public class TestNamespaceCommands extends SecureTestUtil { ProtobufUtil.grant(protocol, testUser, TEST_NAMESPACE, Action.WRITE); } finally { acl.close(); + connection.close(); } return null; } @@ -376,7 +378,8 @@ public class TestNamespaceCommands extends SecureTestUtil { AccessTestAction revokeAction = new AccessTestAction() { public Object run() throws Exception { - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Connection connection = ConnectionFactory.createConnection(conf); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); @@ -385,6 +388,7 @@ public class TestNamespaceCommands extends SecureTestUtil { ProtobufUtil.revoke(protocol, testUser, TEST_NAMESPACE, Action.WRITE); } finally { acl.close(); + connection.close(); } return null; } @@ -393,7 +397,8 @@ public class TestNamespaceCommands extends SecureTestUtil { AccessTestAction getPermissionsAction = new AccessTestAction() { @Override public Object run() throws Exception { - Table acl = new HTable(conf, AccessControlLists.ACL_TABLE_NAME); + Connection connection = ConnectionFactory.createConnection(conf); + Table acl = connection.getTable(AccessControlLists.ACL_TABLE_NAME); try { BlockingRpcChannel service = acl.coprocessorService(HConstants.EMPTY_START_ROW); AccessControlService.BlockingInterface protocol = @@ -401,6 +406,7 @@ public class TestNamespaceCommands extends SecureTestUtil { ProtobufUtil.getUserPermissions(protocol, Bytes.toBytes(TEST_NAMESPACE)); } finally { acl.close(); + connection.close(); } return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java index 7b53a37..e1dfdbf 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestScanEarlyTermination.java @@ -30,6 +30,8 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableNotFoundException; import org.apache.hadoop.hbase.client.Admin; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.HTable; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; @@ -155,7 +157,8 @@ public class TestScanEarlyTermination extends SecureTestUtil { public Object run() throws Exception { // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Put put = new Put(TEST_ROW).add(TEST_FAMILY1, TEST_Q1, ZERO); t.put(put); @@ -169,6 +172,7 @@ public class TestScanEarlyTermination extends SecureTestUtil { t.put(put); } finally { t.close(); + connection.close(); } return null; } @@ -180,7 +184,8 @@ public class TestScanEarlyTermination extends SecureTestUtil { public Object run() throws Exception { // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Scan scan = new Scan().addFamily(TEST_FAMILY1); Result result = t.getScanner(scan).next(); @@ -192,6 +197,7 @@ public class TestScanEarlyTermination extends SecureTestUtil { return null; } finally { t.close(); + connection.close(); } } }, USER_OTHER); @@ -204,7 +210,8 @@ public class TestScanEarlyTermination extends SecureTestUtil { public Object run() throws Exception { // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Scan scan = new Scan(); Result result = t.getScanner(scan).next(); @@ -216,6 +223,7 @@ public class TestScanEarlyTermination extends SecureTestUtil { return null; } finally { t.close(); + connection.close(); } } }, USER_OTHER); @@ -226,7 +234,8 @@ public class TestScanEarlyTermination extends SecureTestUtil { public Object run() throws Exception { // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Scan scan = new Scan().addFamily(TEST_FAMILY2); Result result = t.getScanner(scan).next(); @@ -236,6 +245,7 @@ public class TestScanEarlyTermination extends SecureTestUtil { return null; } finally { t.close(); + connection.close(); } } }, USER_OTHER); @@ -252,7 +262,8 @@ public class TestScanEarlyTermination extends SecureTestUtil { public Object run() throws Exception { // force a new RS connection conf.set("testkey", UUID.randomUUID().toString()); - Table t = new HTable(conf, TEST_TABLE.getTableName()); + Connection connection = ConnectionFactory.createConnection(conf); + Table t = connection.getTable(TEST_TABLE.getTableName()); try { Scan scan = new Scan(); Result result = t.getScanner(scan).next(); @@ -265,6 +276,7 @@ public class TestScanEarlyTermination extends SecureTestUtil { return null; } finally { t.close(); + connection.close(); } } }, USER_OTHER); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java index b795127..3456158 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestTablePermissions.java @@ -288,7 +288,7 @@ public class TestTablePermissions { ListMultimap<String,TablePermission> preperms = AccessControlLists.getTablePermissions(conf, TEST_TABLE); - Table table = new HTable(conf, TEST_TABLE); + Table table = UTIL.getConnection().getTable(TEST_TABLE); table.put(new Put(Bytes.toBytes("row1")) .add(TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes("v1"))); table.put(new Put(Bytes.toBytes("row2")) http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/ExpAsStringVisibilityLabelServiceImpl.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/ExpAsStringVisibilityLabelServiceImpl.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/ExpAsStringVisibilityLabelServiceImpl.java index cc615ed..f8bd117 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/ExpAsStringVisibilityLabelServiceImpl.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/ExpAsStringVisibilityLabelServiceImpl.java @@ -39,6 +39,8 @@ import org.apache.hadoop.hbase.HConstants.OperationStatusCode; import org.apache.hadoop.hbase.Tag; import org.apache.hadoop.hbase.TagType; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Get; import org.apache.hadoop.hbase.client.HTable; @@ -146,14 +148,19 @@ public class ExpAsStringVisibilityLabelServiceImpl implements VisibilityLabelSer List<Cell> cells = null; if (labelsRegion == null) { Table table = null; + Connection connection = null; try { - table = new HTable(conf, VisibilityConstants.LABELS_TABLE_NAME); + connection = ConnectionFactory.createConnection(conf); + table = connection.getTable(VisibilityConstants.LABELS_TABLE_NAME); Result result = table.get(get); cells = result.listCells(); } finally { if (table != null) { table.close(); } + if (connection != null){ + connection.close(); + } } } else { cells = this.labelsRegion.get(get, false); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java index 2897048..061db74 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestDefaultScanLabelGeneratorStack.java @@ -106,6 +106,7 @@ public class TestDefaultScanLabelGeneratorStack { SUPERUSER.runAs(new PrivilegedExceptionAction<Void>() { public Void run() throws Exception { + Connection connection = ConnectionFactory.createConnection(conf); Table table = TEST_UTIL.createTable(tableName, CF); try { Put put = new Put(ROW_1); @@ -122,6 +123,7 @@ public class TestDefaultScanLabelGeneratorStack { return null; } finally { table.close(); + connection.close(); } } }); @@ -168,7 +170,8 @@ public class TestDefaultScanLabelGeneratorStack { TESTUSER.runAs(new PrivilegedExceptionAction<Void>() { public Void run() throws Exception { - Table table = new HTable(conf, tableName); + Connection connection = ConnectionFactory.createConnection(conf); + Table table = connection.getTable(tableName); try { // Test scan with no auth attribute Scan s = new Scan(); @@ -238,6 +241,7 @@ public class TestDefaultScanLabelGeneratorStack { return null; } finally { table.close(); + connection.close(); } } }); http://git-wip-us.apache.org/repos/asf/hbase/blob/9246af8d/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java index a06f03d..df165bd 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestEnforcingScanLabelGenerator.java @@ -143,7 +143,8 @@ public class TestEnforcingScanLabelGenerator { TESTUSER.runAs(new PrivilegedExceptionAction<Void>() { public Void run() throws Exception { - Table table = new HTable(conf, tableName); + Connection connection = ConnectionFactory.createConnection(conf); + Table table = connection.getTable(tableName); try { // Test that we enforce the defined set Get get = new Get(ROW_1); @@ -161,6 +162,7 @@ public class TestEnforcingScanLabelGenerator { return null; } finally { table.close(); + connection.close(); } } });
