You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/01/29 05:41:36 UTC
[2/5] hbase git commit: HBASE-17555 Changed calls to deprecated
getHBaseAdmin to getAdmin
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
index ce123f97..cc970b7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java
@@ -338,7 +338,7 @@ public class TestHRegionServerBulkLoad {
htd.addFamily(new HColumnDescriptor(family(i)));
}
- UTIL.getHBaseAdmin().createTable(htd);
+ UTIL.getAdmin().createTable(htd);
} catch (TableExistsException tee) {
LOG.info("Table " + table + " already exists");
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java
index 67c5f51..3f42276 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestJoinedScanners.java
@@ -95,7 +95,7 @@ public class TestJoinedScanners {
hcd.setDataBlockEncoding(blockEncoding);
desc.addFamily(hcd);
}
- htu.getHBaseAdmin().createTable(desc);
+ htu.getAdmin().createTable(desc);
Table ht = htu.getConnection().getTable(tableName);
long rows_to_insert = 1000;
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
index c93c919..965bb9e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMobStoreScanner.java
@@ -95,7 +95,7 @@ public class TestMobStoreScanner {
hcd.setMobThreshold(threshold);
hcd.setMaxVersions(4);
desc.addFamily(hcd);
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
admin.createTable(desc);
table = ConnectionFactory.createConnection(TEST_UTIL.getConfiguration())
.getTable(tn);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
index 839e5e5..dc87d2f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestPerColumnFamilyFlush.java
@@ -339,7 +339,7 @@ public class TestPerColumnFamilyFlush {
final int numRegionServers = 4;
try {
TEST_UTIL.startMiniCluster(numRegionServers);
- TEST_UTIL.getHBaseAdmin().createNamespace(
+ TEST_UTIL.getAdmin().createNamespace(
NamespaceDescriptor.create(TABLENAME.getNamespaceAsString()).build());
Table table = TEST_UTIL.createTable(TABLENAME, FAMILIES);
HTableDescriptor htd = table.getTableDescriptor();
@@ -581,9 +581,9 @@ public class TestPerColumnFamilyFlush {
int cf3StoreFileCount1 = -1;
try {
TEST_UTIL.startMiniCluster(1);
- TEST_UTIL.getHBaseAdmin().createNamespace(
+ TEST_UTIL.getAdmin().createNamespace(
NamespaceDescriptor.create(TABLENAME.getNamespaceAsString()).build());
- TEST_UTIL.getHBaseAdmin().createTable(htd);
+ TEST_UTIL.getAdmin().createTable(htd);
TEST_UTIL.waitTableAvailable(TABLENAME);
Connection conn = ConnectionFactory.createConnection(conf);
Table table = conn.getTable(TABLENAME);
@@ -605,9 +605,9 @@ public class TestPerColumnFamilyFlush {
conf.setLong(FlushLargeStoresPolicy.HREGION_COLUMNFAMILY_FLUSH_SIZE_LOWER_BOUND_MIN, 0);
try {
TEST_UTIL.startMiniCluster(1);
- TEST_UTIL.getHBaseAdmin().createNamespace(
+ TEST_UTIL.getAdmin().createNamespace(
NamespaceDescriptor.create(TABLENAME.getNamespaceAsString()).build());
- TEST_UTIL.getHBaseAdmin().createTable(htd);
+ TEST_UTIL.getAdmin().createTable(htd);
Connection conn = ConnectionFactory.createConnection(conf);
Table table = conn.getTable(TABLENAME);
doPut(table, memstoreFlushSize);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
index b5c7c40..dae2233 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionMergeTransactionOnCluster.java
@@ -26,6 +26,8 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.commons.lang.math.RandomUtils;
@@ -47,7 +49,6 @@ import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.UnknownRegionException;
import org.apache.hadoop.hbase.client.Admin;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.RegionReplicaUtil;
import org.apache.hadoop.hbase.client.Result;
@@ -321,7 +322,8 @@ public class TestRegionMergeTransactionOnCluster {
public void testMerge() throws Exception {
LOG.info("Starting testMerge");
final TableName tableName = TableName.valueOf("testMerge");
- final HBaseAdmin hbaseAdmin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
+ final int syncWaitTimeout = 10 * 60000; // 10min
try {
// Create table and load data.
@@ -334,18 +336,19 @@ public class TestRegionMergeTransactionOnCluster {
regionStates.regionOffline(a);
try {
// Merge offline region. Region a is offline here
- hbaseAdmin.mergeRegionsSync(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false);
+ admin.mergeRegionsAsync(a.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), false)
+ .get(syncWaitTimeout, TimeUnit.MILLISECONDS);
fail("Offline regions should not be able to merge");
- } catch (IOException ie) {
+ } catch (ExecutionException ie) {
System.out.println(ie);
assertTrue("Exception should mention regions not online",
- StringUtils.stringifyException(ie).contains("regions not online")
- && ie instanceof MergeRegionException);
+ StringUtils.stringifyException(ie.getCause()).contains("regions not online")
+ && ie.getCause() instanceof MergeRegionException);
}
try {
// Merge the same region: b and b.
- hbaseAdmin.mergeRegionsSync(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);
+ admin.mergeRegionsAsync(b.getEncodedNameAsBytes(), b.getEncodedNameAsBytes(), true);
fail("A region should not be able to merge with itself, even forcifully");
} catch (IOException ie) {
assertTrue("Exception should mention regions not online",
@@ -355,7 +358,7 @@ public class TestRegionMergeTransactionOnCluster {
try {
// Merge unknown regions
- hbaseAdmin.mergeRegionsSync(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);
+ admin.mergeRegionsAsync(Bytes.toBytes("-f1"), Bytes.toBytes("-f2"), true);
fail("Unknown region could not be merged");
} catch (IOException ie) {
assertTrue("UnknownRegionException should be thrown",
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
index 2496e2b..abe6c6c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionReplicaFailover.java
@@ -118,7 +118,7 @@ public class TestRegionReplicaFailover {
htd = HTU.createTableDescriptor(
name.getMethodName().substring(0, name.getMethodName().length()-3));
htd.setRegionReplication(3);
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
}
@After
@@ -159,8 +159,8 @@ public class TestRegionReplicaFailover {
HTU.loadNumericRows(table, fam, 0, 1000);
- HTU.getHBaseAdmin().disableTable(htd.getTableName());
- HTU.getHBaseAdmin().enableTable(htd.getTableName());
+ HTU.getAdmin().disableTable(htd.getTableName());
+ HTU.getAdmin().enableTable(htd.getTableName());
HTU.verifyNumericRows(table, fam, 0, 1000, 1);
}
@@ -357,7 +357,7 @@ public class TestRegionReplicaFailover {
byte[] startKey = Bytes.toBytes("aaa");
byte[] endKey = Bytes.toBytes("zzz");
byte[][] splits = HTU.getRegionSplitStartKeys(startKey, endKey, numRegions);
- HTU.getHBaseAdmin().createTable(htd, startKey, endKey, numRegions);
+ HTU.getAdmin().createTable(htd, startKey, endKey, numRegions);
try (Connection connection = ConnectionFactory.createConnection(HTU.getConfiguration());
Table table = connection.getTable(htd.getTableName())) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 15766f5..e6b1bc5 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
@@ -94,7 +94,7 @@ public class TestRegionServerMetrics {
TEST_UTIL.startMiniCluster(1, 1);
cluster = TEST_UTIL.getHBaseCluster();
cluster.waitForActiveAndReadyMaster();
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
connection = TEST_UTIL.getConnection();
while (cluster.getLiveRegionServerThreads().isEmpty() &&
@@ -276,7 +276,7 @@ public class TestRegionServerMetrics {
public void testStoreCount() throws Exception {
//Force a hfile.
doNPuts(1, false);
- TEST_UTIL.getHBaseAdmin().flush(tableName);
+ TEST_UTIL.getAdmin().flush(tableName);
metricsRegionServer.getRegionServerWrapper().forceRecompute();
assertGauge("storeCount", 1);
@@ -287,7 +287,7 @@ public class TestRegionServerMetrics {
public void testStoreFileAge() throws Exception {
//Force a hfile.
doNPuts(1, false);
- TEST_UTIL.getHBaseAdmin().flush(tableName);
+ TEST_UTIL.getAdmin().flush(tableName);
metricsRegionServer.getRegionServerWrapper().forceRecompute();
assertTrue(metricsHelper.getGaugeLong("maxStoreFileAge", serverSource) > 0);
@@ -525,7 +525,7 @@ public class TestRegionServerMetrics {
public void testAverageRegionSize() throws Exception {
//Force a hfile.
doNPuts(1, false);
- TEST_UTIL.getHBaseAdmin().flush(tableName);
+ TEST_UTIL.getAdmin().flush(tableName);
metricsRegionServer.getRegionServerWrapper().forceRecompute();
assertTrue(metricsHelper.getGaugeDouble("averageRegionSize", serverSource) > 0.0);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRemoveRegionMetrics.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRemoveRegionMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRemoveRegionMetrics.java
index 9e1a61e..755e8e3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRemoveRegionMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRemoveRegionMetrics.java
@@ -76,7 +76,7 @@ public class TestRemoveRegionMetrics {
TableName tableName = TableName.valueOf(tableNameString);
Table t = TEST_UTIL.createTable(tableName, Bytes.toBytes("D"));
TEST_UTIL.waitUntilAllRegionsAssigned(t.getName());
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HRegionInfo regionInfo;
byte[] row = Bytes.toBytes("r1");
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 909ae71..8a31af8 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
@@ -78,7 +78,7 @@ public class TestSCVFWithMiniCluster {
util.startMiniCluster(1);
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
destroy(admin, HBASE_TABLE_NAME);
create(admin, HBASE_TABLE_NAME, FAMILY_A, FAMILY_B);
admin.close();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 623d75b..a15cbb3 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
@@ -72,7 +72,7 @@ public class TestScannerWithBulkload {
public void testBulkLoad() throws Exception {
TableName tableName = TableName.valueOf("testBulkLoad");
long l = System.currentTimeMillis();
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
createTable(admin, tableName);
Scan scan = createScan();
final Table table = init(admin, l, scan, tableName);
@@ -210,7 +210,7 @@ public class TestScannerWithBulkload {
public void testBulkLoadWithParallelScan() throws Exception {
final TableName tableName = TableName.valueOf("testBulkLoadWithParallelScan");
final long l = System.currentTimeMillis();
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
createTable(admin, tableName);
Scan scan = createScan();
final Table table = init(admin, l, scan, tableName);
@@ -252,7 +252,7 @@ public class TestScannerWithBulkload {
public void testBulkLoadNativeHFile() throws Exception {
TableName tableName = TableName.valueOf("testBulkLoadNativeHFile");
long l = System.currentTimeMillis();
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
createTable(admin, tableName);
Scan scan = createScan();
final Table table = init(admin, l, scan, tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 043473a..0b0e683 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
@@ -128,7 +128,7 @@ public class TestSplitTransactionOnCluster {
@Before public void setup() throws IOException {
TESTING_UTIL.ensureSomeNonStoppedRegionServersAvailable(NB_SERVERS);
- this.admin = TESTING_UTIL.getHBaseAdmin();
+ this.admin = TESTING_UTIL.getAdmin();
this.cluster = TESTING_UTIL.getMiniHBaseCluster();
}
@@ -517,7 +517,7 @@ public class TestSplitTransactionOnCluster {
HMaster master = abortAndWaitForMaster();
- this.admin = TESTING_UTIL.getHBaseAdmin();
+ this.admin = TESTING_UTIL.getAdmin();
// Update the region to be offline and split, so that HRegionInfo#equals
// returns true in checking rebuilt region states map.
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java
index 1c1a98b..db0803c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestSplitWalDataLoss.java
@@ -81,7 +81,7 @@ public class TestSplitWalDataLoss {
testUtil.getConfiguration().setInt("hbase.regionserver.msginterval", 30000);
testUtil.getConfiguration().setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, false);
testUtil.startMiniCluster(2);
- Admin admin = testUtil.getHBaseAdmin();
+ Admin admin = testUtil.getAdmin();
admin.createNamespace(namespace);
admin.createTable(new HTableDescriptor(tableName).addFamily(new HColumnDescriptor(family)));
testUtil.waitTableAvailable(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 f8107d6..32c7845 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
@@ -117,7 +117,7 @@ public class TestTags {
// colDesc.setDataBlockEncoding(DataBlockEncoding.NONE);
colDesc.setDataBlockEncoding(DataBlockEncoding.PREFIX_TREE);
desc.addFamily(colDesc);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createTable(desc);
byte[] value = Bytes.toBytes("value");
table = TEST_UTIL.getConnection().getTable(tableName);
@@ -183,7 +183,7 @@ public class TestTags {
// colDesc.setDataBlockEncoding(DataBlockEncoding.NONE);
colDesc.setDataBlockEncoding(DataBlockEncoding.PREFIX_TREE);
desc.addFamily(colDesc);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createTable(desc);
table = TEST_UTIL.getConnection().getTable(tableName);
@@ -275,7 +275,7 @@ public class TestTags {
colDesc.setBlockCacheEnabled(true);
colDesc.setDataBlockEncoding(encoding);
desc.addFamily(colDesc);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createTable(desc);
try {
table = TEST_UTIL.getConnection().getTable(tableName);
@@ -387,7 +387,7 @@ public class TestTags {
HTableDescriptor desc = new HTableDescriptor(tableName);
HColumnDescriptor colDesc = new HColumnDescriptor(f);
desc.addFamily(colDesc);
- TEST_UTIL.getHBaseAdmin().createTable(desc);
+ TEST_UTIL.getAdmin().createTable(desc);
Table table = null;
try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
index f3cfc39..74b915e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/compactions/TestFIFOCompactionPolicy.java
@@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTableDescriptor;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
+import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.regionserver.DefaultStoreEngine;
@@ -78,7 +78,7 @@ public class TestFIFOCompactionPolicy {
}
private Store prepareData() throws IOException {
- HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
admin.disableTable(tableName);
admin.deleteTable(tableName);
@@ -131,7 +131,7 @@ public class TestFIFOCompactionPolicy {
try {
Store store = prepareData();
assertEquals(10, store.getStorefilesCount());
- TEST_UTIL.getHBaseAdmin().majorCompact(tableName);
+ TEST_UTIL.getAdmin().majorCompact(tableName);
while (store.getStorefilesCount() > 1) {
Thread.sleep(100);
}
@@ -148,7 +148,7 @@ public class TestFIFOCompactionPolicy {
conf.setInt(HStore.BLOCKING_STOREFILES_KEY, 10000);
TEST_UTIL.startMiniCluster(1);
- HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
TableName tableName = TableName.valueOf(getClass().getSimpleName() + "-TTL");
if (admin.tableExists(tableName)) {
admin.disableTable(tableName);
@@ -177,7 +177,7 @@ public class TestFIFOCompactionPolicy {
conf.setInt(HStore.BLOCKING_STOREFILES_KEY, 10000);
TEST_UTIL.startMiniCluster(1);
- HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
TableName tableName = TableName.valueOf(getClass().getSimpleName() + "-MinVersion");
if (admin.tableExists(tableName)) {
admin.disableTable(tableName);
@@ -208,7 +208,7 @@ public class TestFIFOCompactionPolicy {
conf.setInt(HStore.BLOCKING_STOREFILES_KEY, 10);
TEST_UTIL.startMiniCluster(1);
- HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
TableName tableName = TableName.valueOf(getClass().getSimpleName() + "-BlockingStoreFiles");
if (admin.tableExists(tableName)) {
admin.disableTable(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java
index 41975eb..5a2ac6f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestCompactionWithThroughputController.java
@@ -84,7 +84,7 @@ public class TestCompactionWithThroughputController {
}
private Store prepareData() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
admin.disableTable(tableName);
admin.deleteTable(tableName);
@@ -124,7 +124,7 @@ public class TestCompactionWithThroughputController {
Store store = prepareData();
assertEquals(10, store.getStorefilesCount());
long startTime = System.currentTimeMillis();
- TEST_UTIL.getHBaseAdmin().majorCompact(tableName);
+ TEST_UTIL.getAdmin().majorCompact(tableName);
while (store.getStorefilesCount() != 1) {
Thread.sleep(20);
}
@@ -153,7 +153,7 @@ public class TestCompactionWithThroughputController {
Store store = prepareData();
assertEquals(10, store.getStorefilesCount());
long startTime = System.currentTimeMillis();
- TEST_UTIL.getHBaseAdmin().majorCompact(tableName);
+ TEST_UTIL.getAdmin().majorCompact(tableName);
while (store.getStorefilesCount() != 1) {
Thread.sleep(20);
}
@@ -202,7 +202,7 @@ public class TestCompactionWithThroughputController {
HTableDescriptor htd = new HTableDescriptor(tableName);
htd.addFamily(new HColumnDescriptor(family));
htd.setCompactionEnabled(false);
- TEST_UTIL.getHBaseAdmin().createTable(htd);
+ TEST_UTIL.getAdmin().createTable(htd);
TEST_UTIL.waitTableAvailable(tableName);
HRegionServer regionServer = TEST_UTIL.getRSForFirstRegionInTable(tableName);
PressureAwareCompactionThroughputController throughputController =
@@ -259,7 +259,7 @@ public class TestCompactionWithThroughputController {
HTableDescriptor htd = new HTableDescriptor(tableName);
htd.addFamily(new HColumnDescriptor(family));
htd.setCompactionEnabled(false);
- TEST_UTIL.getHBaseAdmin().createTable(htd);
+ TEST_UTIL.getAdmin().createTable(htd);
TEST_UTIL.waitTableAvailable(tableName);
HStore store = (HStore) getStoreWithName(tableName);
assertEquals(0, store.getStorefilesCount());
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java
index f328b1c..fb11756 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/throttle/TestFlushWithThroughputController.java
@@ -110,7 +110,7 @@ public class TestFlushWithThroughputController {
table.put(new Put(Bytes.toBytes(i * 10 + j)).addColumn(family, qualifier, value));
}
long startTime = System.nanoTime();
- hbtu.getHBaseAdmin().flush(tableName);
+ hbtu.getAdmin().flush(tableName);
duration += System.nanoTime() - startTime;
}
Store store = getStoreWithName(tableName);
@@ -159,7 +159,7 @@ public class TestFlushWithThroughputController {
HTableDescriptor htd = new HTableDescriptor(tableName);
htd.addFamily(new HColumnDescriptor(family));
htd.setCompactionEnabled(false);
- hbtu.getHBaseAdmin().createTable(htd);
+ hbtu.getAdmin().createTable(htd);
hbtu.waitTableAvailable(tableName);
HRegionServer regionServer = hbtu.getRSForFirstRegionInTable(tableName);
PressureAwareFlushThroughputController throughputController =
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java
index a4acc4f..c3fafb6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestLogRolling.java
@@ -119,7 +119,7 @@ public abstract class AbstractTestLogRolling {
cluster = TEST_UTIL.getHBaseCluster();
dfsCluster = TEST_UTIL.getDFSCluster();
fs = TEST_UTIL.getTestFileSystem();
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
// disable region rebalancing (interferes with log watching)
cluster.getMaster().balanceSwitch(false);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java
index ceefc98..40a7f5c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/AbstractTestWALReplay.java
@@ -257,7 +257,7 @@ public abstract class AbstractTestWALReplay {
throws InterruptedException, MasterNotRunningException,
ZooKeeperConnectionException, IOException {
HMaster master = TEST_UTIL.getMiniHBaseCluster().getMaster();
- TEST_UTIL.getHBaseAdmin().move(
+ TEST_UTIL.getAdmin().move(
destRegion.getRegionInfo().getEncodedNameAsBytes(),
Bytes.toBytes(destServer.getServerName().getServerName()));
while (true) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 9851815..aec0a47 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
@@ -104,7 +104,7 @@ public class TestLogRollAbort {
cluster = TEST_UTIL.getHBaseCluster();
dfsCluster = TEST_UTIL.getDFSCluster();
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
conf = TEST_UTIL.getConfiguration();
fs = TEST_UTIL.getDFSCluster().getFileSystem();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
index c1a9e25..c1b6f4a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java
@@ -508,7 +508,7 @@ public class TestMasterReplication {
private void createTableOnClusters(HTableDescriptor table) throws Exception {
for (HBaseTestingUtility utility : utilities) {
- utility.getHBaseAdmin().createTable(table);
+ utility.getAdmin().createTable(table);
}
}
@@ -691,7 +691,7 @@ public class TestMasterReplication {
private void rollWALAndWait(final HBaseTestingUtility utility, final TableName table,
final byte[] row) throws IOException {
- final Admin admin = utility.getHBaseAdmin();
+ final Admin admin = utility.getAdmin();
final MiniHBaseCluster cluster = utility.getMiniHBaseCluster();
// find the region that corresponds to the given row.
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 29e7d67..6af5d8d 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
@@ -136,9 +136,9 @@ public class TestMultiSlaveReplication {
utility3.startMiniCluster();
ReplicationAdmin admin1 = new ReplicationAdmin(conf1);
- utility1.getHBaseAdmin().createTable(table);
- utility2.getHBaseAdmin().createTable(table);
- utility3.getHBaseAdmin().createTable(table);
+ utility1.getAdmin().createTable(table);
+ utility2.getAdmin().createTable(table);
+ utility3.getAdmin().createTable(table);
Table htable1 = utility1.getConnection().getTable(tableName);
htable1.setWriteBufferSize(1024);
Table htable2 = utility2.getConnection().getTable(tableName);
@@ -208,7 +208,7 @@ public class TestMultiSlaveReplication {
private void rollWALAndWait(final HBaseTestingUtility utility, final TableName table,
final byte[] row) throws IOException {
- final Admin admin = utility.getHBaseAdmin();
+ final Admin admin = utility.getAdmin();
final MiniHBaseCluster cluster = utility.getMiniHBaseCluster();
// find the region that corresponds to the given row.
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 8c218d0..557ed99 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
@@ -57,7 +57,7 @@ public class TestReplicationChangingPeerRegionservers extends TestReplicationBas
// rolling like this makes sure the most recent one gets added to the queue
for (JVMClusterUtil.RegionServerThread r :
utility1.getHBaseCluster().getRegionServerThreads()) {
- utility1.getHBaseAdmin().rollWALWriter(r.getRegionServer().getServerName());
+ utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());
}
utility1.deleteTableData(tableName);
// truncating the table will send one Delete per row to the slave cluster
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
index f9c467e..f4f5f24 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationEndpoint.java
@@ -90,7 +90,7 @@ public class TestReplicationEndpoint extends TestReplicationBase {
final List<RegionServerThread> rsThreads =
utility1.getMiniHBaseCluster().getRegionServerThreads();
for (RegionServerThread rs : rsThreads) {
- utility1.getHBaseAdmin().rollWALWriter(rs.getRegionServer().getServerName());
+ utility1.getAdmin().rollWALWriter(rs.getRegionServer().getServerName());
}
// Wait for all log roll to finish
utility1.waitFor(3000, new Waiter.ExplainingPredicate<Exception>() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 58249f1..c892c5d 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
@@ -86,7 +86,7 @@ public class TestReplicationSmallTests extends TestReplicationBase {
// rolling like this makes sure the most recent one gets added to the queue
for ( JVMClusterUtil.RegionServerThread r :
utility1.getHBaseCluster().getRegionServerThreads()) {
- utility1.getHBaseAdmin().rollWALWriter(r.getRegionServer().getServerName());
+ utility1.getAdmin().rollWALWriter(r.getRegionServer().getServerName());
}
int rowCount = utility1.countRows(tableName);
utility1.deleteTableData(tableName);
@@ -765,7 +765,7 @@ public class TestReplicationSmallTests extends TestReplicationBase {
final String colFam = "cf1";
final int numOfTables = 3;
- Admin hadmin = utility1.getHBaseAdmin();
+ Admin hadmin = utility1.getAdmin();
// Create Tables
for (int i = 0; i < numOfTables; i++) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 bd07c9d..e61ceb2 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
@@ -183,12 +183,12 @@ public class TestReplicationSyncUpTool extends TestReplicationBase {
ReplicationAdmin admin1 = new ReplicationAdmin(conf1);
ReplicationAdmin admin2 = new ReplicationAdmin(conf2);
- Admin ha = utility1.getHBaseAdmin();
+ Admin ha = utility1.getAdmin();
ha.createTable(t1_syncupSource);
ha.createTable(t2_syncupSource);
ha.close();
- ha = utility2.getHBaseAdmin();
+ ha = utility2.getAdmin();
ha.createTable(t1_syncupTarget);
ha.createTable(t2_syncupTarget);
ha.close();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
index 752afe8..f848457 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestSerialReplication.java
@@ -114,7 +114,7 @@ public class TestSerialReplication {
rpc.setClusterKey(utility2.getClusterKey());
admin1.addPeer("1", rpc, null);
- utility1.getHBaseAdmin().setBalancerRunning(false, true);
+ utility1.getAdmin().setBalancerRunning(false, true);
}
@Test
@@ -124,8 +124,8 @@ public class TestSerialReplication {
HColumnDescriptor fam = new HColumnDescriptor(famName);
fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
table.addFamily(fam);
- utility1.getHBaseAdmin().createTable(table);
- utility2.getHBaseAdmin().createTable(table);
+ utility1.getAdmin().createTable(table);
+ utility2.getAdmin().createTable(table);
try(Table t1 = utility1.getConnection().getTable(tableName);
Table t2 = utility2.getConnection().getTable(tableName)) {
LOG.info("move to 1");
@@ -183,8 +183,8 @@ public class TestSerialReplication {
HColumnDescriptor fam = new HColumnDescriptor(famName);
fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
table.addFamily(fam);
- utility1.getHBaseAdmin().createTable(table);
- utility2.getHBaseAdmin().createTable(table);
+ utility1.getAdmin().createTable(table);
+ utility2.getAdmin().createTable(table);
try(Table t1 = utility1.getConnection().getTable(tableName);
Table t2 = utility2.getConnection().getTable(tableName)) {
@@ -193,7 +193,7 @@ public class TestSerialReplication {
put.addColumn(famName, VALUE, VALUE);
t1.put(put);
}
- utility1.getHBaseAdmin().split(tableName, ROWS[50]);
+ utility1.getAdmin().split(tableName, ROWS[50]);
waitTableHasRightNumberOfRegions(tableName, 2);
for (int i = 11; i < 100; i += 10) {
Put put = new Put(ROWS[i]);
@@ -253,10 +253,10 @@ public class TestSerialReplication {
HColumnDescriptor fam = new HColumnDescriptor(famName);
fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
table.addFamily(fam);
- utility1.getHBaseAdmin().createTable(table);
- utility2.getHBaseAdmin().createTable(table);
+ utility1.getAdmin().createTable(table);
+ utility2.getAdmin().createTable(table);
Threads.sleep(5000);
- utility1.getHBaseAdmin().split(tableName, ROWS[50]);
+ utility1.getAdmin().split(tableName, ROWS[50]);
waitTableHasRightNumberOfRegions(tableName, 2);
try(Table t1 = utility1.getConnection().getTable(tableName);
@@ -268,7 +268,7 @@ public class TestSerialReplication {
}
List<Pair<HRegionInfo, ServerName>> regions =
MetaTableAccessor.getTableRegionsAndLocations(utility1.getConnection(), tableName);
- utility1.getHBaseAdmin().mergeRegionsAsync(regions.get(0).getFirst().getRegionName(),
+ utility1.getAdmin().mergeRegionsAsync(regions.get(0).getFirst().getRegionName(),
regions.get(1).getFirst().getRegionName(), true);
waitTableHasRightNumberOfRegions(tableName, 1);
for (int i = 11; i < 100; i += 10) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
index 4331239..e65e776 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestGlobalThrottler.java
@@ -118,8 +118,8 @@ public class TestGlobalThrottler {
HColumnDescriptor fam = new HColumnDescriptor(famName);
fam.setScope(HConstants.REPLICATION_SCOPE_SERIAL);
table.addFamily(fam);
- utility1.getHBaseAdmin().createTable(table);
- utility2.getHBaseAdmin().createTable(table);
+ utility1.getAdmin().createTable(table);
+ utility2.getAdmin().createTable(table);
Thread watcher = new Thread(()->{
Replication replication = (Replication)utility1.getMiniHBaseCluster()
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java
index 11df7e0..d8386d7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestRegionReplicaReplicationEndpoint.java
@@ -126,7 +126,7 @@ public class TestRegionReplicaReplicationEndpoint {
HTableDescriptor htd = HTU.createTableDescriptor(
"testReplicationPeerIsCreated_no_region_replicas");
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
try {
peerConfig = admin.getPeerConfig(peerId);
fail("Should throw ReplicationException, because replication peer id=" + peerId
@@ -137,7 +137,7 @@ public class TestRegionReplicaReplicationEndpoint {
htd = HTU.createTableDescriptor("testReplicationPeerIsCreated");
htd.setRegionReplication(2);
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
// assert peer configuration is correct
peerConfig = admin.getPeerConfig(peerId);
@@ -170,7 +170,7 @@ public class TestRegionReplicaReplicationEndpoint {
HTableDescriptor htd
= HTU.createTableDescriptor("testRegionReplicaReplicationPeerIsCreatedForModifyTable");
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
// assert that replication peer is not created yet
try {
@@ -181,10 +181,10 @@ public class TestRegionReplicaReplicationEndpoint {
}
assertNull(peerConfig);
- HTU.getHBaseAdmin().disableTable(htd.getTableName());
+ HTU.getAdmin().disableTable(htd.getTableName());
htd.setRegionReplication(2);
- HTU.getHBaseAdmin().modifyTable(htd.getTableName(), htd);
- HTU.getHBaseAdmin().enableTable(htd.getTableName());
+ HTU.getAdmin().modifyTable(htd.getTableName(), htd);
+ HTU.getAdmin().enableTable(htd.getTableName());
// assert peer configuration is correct
peerConfig = admin.getPeerConfig(peerId);
@@ -203,7 +203,7 @@ public class TestRegionReplicaReplicationEndpoint {
+ regionReplication);
HTableDescriptor htd = HTU.createTableDescriptor(tableName.toString());
htd.setRegionReplication(regionReplication);
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
TableName tableNameNoReplicas =
TableName.valueOf("testRegionReplicaReplicationWithReplicas_NO_REPLICAS");
HTU.deleteTableIfAny(tableNameNoReplicas);
@@ -294,7 +294,7 @@ public class TestRegionReplicaReplicationEndpoint {
HTableDescriptor htd = HTU.createTableDescriptor(tableName.toString());
htd.setRegionReplication(regionReplication);
htd.setRegionMemstoreReplication(false);
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
Connection connection = ConnectionFactory.createConnection(HTU.getConfiguration());
Table table = connection.getTable(tableName);
@@ -329,7 +329,7 @@ public class TestRegionReplicaReplicationEndpoint {
TableName tableName = TableName.valueOf("testRegionReplicaReplicationForFlushAndCompaction");
HTableDescriptor htd = HTU.createTableDescriptor(tableName.toString());
htd.setRegionReplication(regionReplication);
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
Connection connection = ConnectionFactory.createConnection(HTU.getConfiguration());
@@ -375,12 +375,12 @@ public class TestRegionReplicaReplicationEndpoint {
int regionReplication = 3;
htd.setRegionReplication(regionReplication);
HTU.deleteTableIfAny(tableName);
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
TableName toBeDisabledTable = TableName.valueOf(dropTable ? "droppedTable" : "disabledTable");
HTU.deleteTableIfAny(toBeDisabledTable);
htd = HTU.createTableDescriptor(toBeDisabledTable.toString());
htd.setRegionReplication(regionReplication);
- HTU.getHBaseAdmin().createTable(htd);
+ HTU.getAdmin().createTable(htd);
// both tables are created, now pause replication
ReplicationAdmin admin = new ReplicationAdmin(HTU.getConfiguration());
@@ -410,9 +410,9 @@ public class TestRegionReplicaReplicationEndpoint {
new WALKey(encodedRegionName, toBeDisabledTable, 1),
new WALEdit());
- HTU.getHBaseAdmin().disableTable(toBeDisabledTable); // disable the table
+ HTU.getAdmin().disableTable(toBeDisabledTable); // disable the table
if (dropTable) {
- HTU.getHBaseAdmin().deleteTable(toBeDisabledTable);
+ HTU.getAdmin().deleteTable(toBeDisabledTable);
}
sinkWriter.append(toBeDisabledTable, encodedRegionName,
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java
index 340665f..067e1f5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/SecureTestUtil.java
@@ -656,18 +656,18 @@ public class SecureTestUtil {
HColumnDescriptor hcd = new HColumnDescriptor(family);
htd.addFamily(hcd);
}
- createTable(testUtil, testUtil.getHBaseAdmin(), htd);
+ createTable(testUtil, testUtil.getAdmin(), htd);
return testUtil.getConnection().getTable(htd.getTableName());
}
public static void createTable(HBaseTestingUtility testUtil, HTableDescriptor htd)
throws Exception {
- createTable(testUtil, testUtil.getHBaseAdmin(), htd);
+ createTable(testUtil, testUtil.getAdmin(), htd);
}
public static void createTable(HBaseTestingUtility testUtil, HTableDescriptor htd,
byte[][] splitKeys) throws Exception {
- createTable(testUtil, testUtil.getHBaseAdmin(), htd, splitKeys);
+ createTable(testUtil, testUtil.getAdmin(), htd, splitKeys);
}
public static void createTable(HBaseTestingUtility testUtil, Admin admin, HTableDescriptor htd)
@@ -694,17 +694,17 @@ public class SecureTestUtil {
public static void deleteTable(HBaseTestingUtility testUtil, TableName tableName)
throws Exception {
- deleteTable(testUtil, testUtil.getHBaseAdmin(), tableName);
+ deleteTable(testUtil, testUtil.getAdmin(), tableName);
}
public static void createNamespace(HBaseTestingUtility testUtil, NamespaceDescriptor nsDesc)
throws Exception {
- testUtil.getHBaseAdmin().createNamespace(nsDesc);
+ testUtil.getAdmin().createNamespace(nsDesc);
}
public static void deleteNamespace(HBaseTestingUtility testUtil, String namespace)
throws Exception {
- testUtil.getHBaseAdmin().deleteNamespace(namespace);
+ testUtil.getAdmin().deleteNamespace(namespace);
}
public static void deleteTable(HBaseTestingUtility testUtil, Admin admin, TableName tableName)
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 cc6425f..2efc5ff 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
@@ -1066,8 +1066,8 @@ public class TestAccessController extends SecureTestUtil {
USER_GROUP_ADMIN);
} finally {
// Reinit after the bulk upload
- TEST_UTIL.getHBaseAdmin().disableTable(TEST_TABLE);
- TEST_UTIL.getHBaseAdmin().enableTable(TEST_TABLE);
+ TEST_UTIL.getAdmin().disableTable(TEST_TABLE);
+ TEST_UTIL.getAdmin().enableTable(TEST_TABLE);
}
}
@@ -1267,7 +1267,7 @@ public class TestAccessController extends SecureTestUtil {
final byte[] qualifier = Bytes.toBytes("q");
// create table
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
deleteTable(TEST_UTIL, tableName);
}
@@ -1521,7 +1521,7 @@ public class TestAccessController extends SecureTestUtil {
final byte[] qualifier = Bytes.toBytes("q");
// create table
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
deleteTable(TEST_UTIL, tableName);
}
@@ -1625,7 +1625,7 @@ public class TestAccessController extends SecureTestUtil {
final byte[] qualifier = Bytes.toBytes("q");
// create table
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
deleteTable(TEST_UTIL, tableName);
}
@@ -2010,7 +2010,7 @@ public class TestAccessController extends SecureTestUtil {
@Test (timeout=180000)
public void testSnapshot() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
final HTableDescriptor htd = admin.getTableDescriptor(TEST_TABLE);
SnapshotDescription.Builder builder = SnapshotDescription.newBuilder();
builder.setName(TEST_TABLE.getNameAsString() + "-snapshot");
@@ -2071,7 +2071,7 @@ public class TestAccessController extends SecureTestUtil {
@Test (timeout=180000)
public void testSnapshotWithOwner() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
final HTableDescriptor htd = admin.getTableDescriptor(TEST_TABLE);
SnapshotDescription.Builder builder = SnapshotDescription.newBuilder();
builder.setName(TEST_TABLE.getNameAsString() + "-snapshot");
@@ -2132,7 +2132,7 @@ public class TestAccessController extends SecureTestUtil {
LOG.debug("Test for global authorization for a new registered RegionServer.");
MiniHBaseCluster hbaseCluster = TEST_UTIL.getHBaseCluster();
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
HTableDescriptor htd = new HTableDescriptor(TEST_TABLE2);
htd.addFamily(new HColumnDescriptor(TEST_FAMILY));
createTable(TEST_UTIL, htd);
@@ -2660,7 +2660,7 @@ public class TestAccessController extends SecureTestUtil {
systemUserConnection, TEST_TABLE.getNameAsString());
assertTrue(existingPerms != null);
assertTrue(existingPerms.size() > 1);
- TEST_UTIL.getHBaseAdmin().disableTable(TEST_TABLE);
+ TEST_UTIL.getAdmin().disableTable(TEST_TABLE);
TEST_UTIL.truncateTable(TEST_TABLE);
TEST_UTIL.waitTableAvailable(TEST_TABLE);
List<UserPermission> perms = AccessControlClient.getUserPermissions(
@@ -2715,7 +2715,7 @@ public class TestAccessController extends SecureTestUtil {
final byte[] family = Bytes.toBytes("f1");
// create table in default ns
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HTableDescriptor htd = new HTableDescriptor(table1);
htd.addFamily(new HColumnDescriptor(family));
createTable(TEST_UTIL, htd);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 5ddfb9c..29bbbbb 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
@@ -139,7 +139,7 @@ public class TestCellACLs extends SecureTestUtil {
@Before
public void setUp() throws Exception {
// Create the test table (owner added to the _acl_ table)
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName());
HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY);
hcd.setMaxVersions(4);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCoprocessorWhitelistMasterObserver.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCoprocessorWhitelistMasterObserver.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCoprocessorWhitelistMasterObserver.java
index 5a90d59..87fd6ab 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCoprocessorWhitelistMasterObserver.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestCoprocessorWhitelistMasterObserver.java
@@ -60,7 +60,7 @@ public class TestCoprocessorWhitelistMasterObserver extends SecureTestUtil {
@After
public void tearDownTestCoprocessorWhitelistMasterObserver() throws Exception {
- Admin admin = UTIL.getHBaseAdmin();
+ Admin admin = UTIL.getAdmin();
try {
try {
admin.disableTable(TEST_TABLE);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 17b143e..de98092 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
@@ -153,8 +153,8 @@ public class TestNamespaceCommands extends SecureTestUtil {
.getRegionServerCoprocessorHost()
.findCoprocessor(AccessController.class.getName());
- UTIL.getHBaseAdmin().createNamespace(NamespaceDescriptor.create(TEST_NAMESPACE).build());
- UTIL.getHBaseAdmin().createNamespace(NamespaceDescriptor.create(TEST_NAMESPACE2).build());
+ UTIL.getAdmin().createNamespace(NamespaceDescriptor.create(TEST_NAMESPACE).build());
+ UTIL.getAdmin().createNamespace(NamespaceDescriptor.create(TEST_NAMESPACE2).build());
// grants on global
grantGlobal(UTIL, USER_GLOBAL_ADMIN.getShortName(), Permission.Action.ADMIN);
@@ -181,8 +181,8 @@ public class TestNamespaceCommands extends SecureTestUtil {
@AfterClass
public static void afterClass() throws Exception {
- UTIL.getHBaseAdmin().deleteNamespace(TEST_NAMESPACE);
- UTIL.getHBaseAdmin().deleteNamespace(TEST_NAMESPACE2);
+ UTIL.getAdmin().deleteNamespace(TEST_NAMESPACE);
+ UTIL.getAdmin().deleteNamespace(TEST_NAMESPACE2);
UTIL.shutdownMiniCluster();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 74105e1..c39a84b 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
@@ -116,7 +116,7 @@ public class TestScanEarlyTermination extends SecureTestUtil {
@Before
public void setUp() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName());
htd.setOwner(USER_OWNER);
HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY1);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/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 b23651f..602d18f 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
@@ -315,7 +315,7 @@ public class TestTablePermissions {
.addColumn(TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes("v1")));
table.put(new Put(Bytes.toBytes("row2"))
.addColumn(TEST_FAMILY, TEST_QUALIFIER, Bytes.toBytes("v2")));
- Admin admin = UTIL.getHBaseAdmin();
+ Admin admin = UTIL.getAdmin();
admin.split(TEST_TABLE);
// wait for split
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
index ad35975..7c60f68 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestWithDisabledAuthorization.java
@@ -183,7 +183,7 @@ public class TestWithDisabledAuthorization extends SecureTestUtil {
@Before
public void setUp() throws Exception {
// Create the test table (owner added to the _acl_ table)
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HTableDescriptor htd = new HTableDescriptor(TEST_TABLE.getTableName());
HColumnDescriptor hcd = new HColumnDescriptor(TEST_FAMILY);
hcd.setMaxVersions(100);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java
index 56a7260..dd1fe2a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java
@@ -142,10 +142,10 @@ public class TestVisibilityLabelReplicationWithExpAsString extends TestVisibilit
HColumnDescriptor desc = new HColumnDescriptor(fam);
desc.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);
table.addFamily(desc);
- try (Admin hBaseAdmin = TEST_UTIL.getHBaseAdmin()) {
+ try (Admin hBaseAdmin = TEST_UTIL.getAdmin()) {
hBaseAdmin.createTable(table);
}
- try (Admin hBaseAdmin1 = TEST_UTIL1.getHBaseAdmin()){
+ try (Admin hBaseAdmin1 = TEST_UTIL1.getAdmin()){
hBaseAdmin1.createTable(table);
}
addLabels();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
index 0cbe554..2111229 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabels.java
@@ -651,7 +651,7 @@ public abstract class TestVisibilityLabels {
@Test
public void testUserShouldNotDoDDLOpOnLabelsTable() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
try {
admin.disableTable(LABELS_TABLE_NAME);
fail("Lables table should not get disabled by user.");
@@ -705,7 +705,7 @@ public abstract class TestVisibilityLabels {
col = new HColumnDescriptor(fam2);
col.setMaxVersions(5);
desc.addFamily(col);
- TEST_UTIL.getHBaseAdmin().createTable(desc);
+ TEST_UTIL.getAdmin().createTable(desc);
try (Table table = TEST_UTIL.getConnection().getTable(tableName)) {
Put put = new Put(r1);
put.addColumn(fam, qual, 3l, v1);
@@ -789,7 +789,7 @@ public abstract class TestVisibilityLabels {
HTableDescriptor desc = new HTableDescriptor(tableName);
HColumnDescriptor col = new HColumnDescriptor(fam);
desc.addFamily(col);
- TEST_UTIL.getHBaseAdmin().createTable(desc);
+ TEST_UTIL.getAdmin().createTable(desc);
try (Table table = TEST_UTIL.getConnection().getTable(tableName)){
Put p1 = new Put(row1);
p1.addColumn(fam, qual, value);
@@ -825,7 +825,7 @@ public abstract class TestVisibilityLabels {
HTableDescriptor desc = new HTableDescriptor(tableName);
HColumnDescriptor col = new HColumnDescriptor(fam);
desc.addFamily(col);
- TEST_UTIL.getHBaseAdmin().createTable(desc);
+ TEST_UTIL.getAdmin().createTable(desc);
try (Table table = TEST_UTIL.getConnection().getTable(tableName)) {
Put p1 = new Put(row1);
p1.addColumn(fam, qual, value);
@@ -841,7 +841,7 @@ public abstract class TestVisibilityLabels {
table.mutateRow(rm);
}
- TEST_UTIL.getHBaseAdmin().flush(tableName);
+ TEST_UTIL.getAdmin().flush(tableName);
List<HRegion> regions = TEST_UTIL.getHBaseCluster().getRegions(tableName);
Store store = regions.get(0).getStore(fam);
Collection<StoreFile> storefiles = store.getStorefiles();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java
index 48703b0..5977c23 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java
@@ -187,7 +187,7 @@ public class TestVisibilityLabelsReplication {
rpc.setClusterKey(TEST_UTIL1.getClusterKey());
replicationAdmin.addPeer("2", rpc, null);
- Admin hBaseAdmin = TEST_UTIL.getHBaseAdmin();
+ Admin hBaseAdmin = TEST_UTIL.getAdmin();
HTableDescriptor table = new HTableDescriptor(TABLE_NAME);
HColumnDescriptor desc = new HColumnDescriptor(fam);
desc.setScope(HConstants.REPLICATION_SCOPE_GLOBAL);
@@ -199,7 +199,7 @@ public class TestVisibilityLabelsReplication {
hBaseAdmin.close();
}
}
- Admin hBaseAdmin1 = TEST_UTIL1.getHBaseAdmin();
+ Admin hBaseAdmin1 = TEST_UTIL1.getAdmin();
try {
hBaseAdmin1.createTable(table);
} finally {