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:37 UTC
[3/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/master/TestAssignmentManagerOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
index e473b75..ba88008 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestAssignmentManagerOnCluster.java
@@ -104,7 +104,7 @@ public class TestAssignmentManagerOnCluster {
conf.setInt("hbase.master.ping.server.retry.sleep.interval", 1);
TEST_UTIL.startMiniCluster(1, 4, null, MyMaster.class, MyRegionServer.class);
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
}
@AfterClass
@@ -200,7 +200,7 @@ public class TestAssignmentManagerOnCluster {
// Region is assigned now. Let's assign it again.
// Master should not abort, and region should be assigned.
- TEST_UTIL.getHBaseAdmin().assign(hri.getRegionName());
+ TEST_UTIL.getAdmin().assign(hri.getRegionName());
master.getAssignmentManager().waitForAssignment(hri);
RegionState newState = regionStates.getRegionState(hri);
assertTrue(newState.isOpened());
@@ -334,7 +334,7 @@ public class TestAssignmentManagerOnCluster {
}
assertTrue(destServerName != null
&& !destServerName.equals(serverName));
- TEST_UTIL.getHBaseAdmin().move(hri.getEncodedNameAsBytes(),
+ TEST_UTIL.getAdmin().move(hri.getEncodedNameAsBytes(),
Bytes.toBytes(destServerName.getServerName()));
long timeoutTime = System.currentTimeMillis() + 30000;
@@ -366,7 +366,7 @@ public class TestAssignmentManagerOnCluster {
public void testMoveRegionOfDeletedTable() throws Exception {
TableName table =
TableName.valueOf("testMoveRegionOfDeletedTable");
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
try {
HRegionInfo hri = createTableAndGetOneRegion(table);
@@ -736,7 +736,7 @@ public class TestAssignmentManagerOnCluster {
am.regionOnline(hri, serverName);
}
am.getTableStateManager().setTableState(table, TableState.State.ENABLED);
- TEST_UTIL.getHBaseAdmin().disableTable(table);
+ TEST_UTIL.getAdmin().disableTable(table);
TEST_UTIL.deleteTable(table);
}
}
@@ -1195,7 +1195,7 @@ public class TestAssignmentManagerOnCluster {
// Closing region should just work fine
admin.disableTable(table);
assertTrue(regionStates.isRegionOffline(hri));
- List<HRegionInfo> regions = TEST_UTIL.getHBaseAdmin().getOnlineRegions(serverName);
+ List<HRegionInfo> regions = TEST_UTIL.getAdmin().getOnlineRegions(serverName);
assertTrue(!regions.contains(hri));
} finally {
MyRegionServer.simulateRetry = false;
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
index 59ccbcf..ed29010 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestDistributedLogSplitting.java
@@ -836,7 +836,7 @@ public class TestDistributedLogSplitting {
makeWAL(hrs, regions, "table", "family", NUM_LOG_LINES, 100);
LOG.info("Disabling table\n");
- TEST_UTIL.getHBaseAdmin().disableTable(TableName.valueOf("disableTable"));
+ TEST_UTIL.getAdmin().disableTable(TableName.valueOf("disableTable"));
TEST_UTIL.waitTableDisabled(TableName.valueOf("disableTable").getName());
// abort RS
@@ -955,7 +955,7 @@ public class TestDistributedLogSplitting {
// move region in order for the region opened in recovering state
final HRegionInfo hri = region;
final HRegionServer tmpRS = dstRS;
- TEST_UTIL.getHBaseAdmin().move(region.getEncodedNameAsBytes(),
+ TEST_UTIL.getAdmin().move(region.getEncodedNameAsBytes(),
Bytes.toBytes(dstRS.getServerName().getServerName()));
// wait for region move completes
final RegionStates regionStates =
@@ -1325,7 +1325,7 @@ public class TestDistributedLogSplitting {
// after flush
LOG.info("Verification after flush...");
- TEST_UTIL.getHBaseAdmin().flush(tableName);
+ TEST_UTIL.getAdmin().flush(tableName);
r = ht.get(g);
theStoredVal = Bytes.toLong(r.getValue(family, qualifier));
assertEquals(value, theStoredVal);
@@ -1420,14 +1420,14 @@ public class TestDistributedLogSplitting {
// after flush & compaction
LOG.info("Verification after flush...");
- TEST_UTIL.getHBaseAdmin().flush(tableName);
- TEST_UTIL.getHBaseAdmin().compact(tableName);
+ TEST_UTIL.getAdmin().flush(tableName);
+ TEST_UTIL.getAdmin().compact(tableName);
// wait for compaction completes
TEST_UTIL.waitFor(30000, 200, new Waiter.Predicate<Exception>() {
@Override
public boolean evaluate() throws Exception {
- return (TEST_UTIL.getHBaseAdmin()
+ return (TEST_UTIL.getAdmin()
.getCompactionState(tableName) == CompactionState.NONE);
}
});
@@ -1497,7 +1497,7 @@ public class TestDistributedLogSplitting {
// disable-enable cycle to get rid of table's dead regions left behind
// by createMultiRegions
LOG.debug("Disabling table\n");
- TEST_UTIL.getHBaseAdmin().disableTable(table);
+ TEST_UTIL.getAdmin().disableTable(table);
LOG.debug("Waiting for no more RIT\n");
blockUntilNoRIT(zkw, master);
NavigableSet<String> regions = HBaseTestingUtility.getAllOnlineRegions(cluster);
@@ -1508,7 +1508,7 @@ public class TestDistributedLogSplitting {
}
assertEquals(2 + existingRegions, regions.size());
LOG.debug("Enabling table\n");
- TEST_UTIL.getHBaseAdmin().enableTable(table);
+ TEST_UTIL.getAdmin().enableTable(table);
LOG.debug("Waiting for no more RIT\n");
blockUntilNoRIT(zkw, master);
LOG.debug("Verifying there are " + numRegions + " assigned on cluster\n");
@@ -1778,9 +1778,9 @@ public class TestDistributedLogSplitting {
final HRegionServer destRS = hrs;
// the RS doesn't have regions of the specified table so we need move one to this RS
List<HRegionInfo> tableRegions =
- TEST_UTIL.getHBaseAdmin().getTableRegions(TableName.valueOf(tableName));
+ TEST_UTIL.getAdmin().getTableRegions(TableName.valueOf(tableName));
final HRegionInfo hri = tableRegions.get(0);
- TEST_UTIL.getHBaseAdmin().move(hri.getEncodedNameAsBytes(),
+ TEST_UTIL.getAdmin().move(hri.getEncodedNameAsBytes(),
Bytes.toBytes(destRS.getServerName().getServerName()));
// wait for region move completes
final RegionStates regionStates =
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.java
index 2c79087..5aa2176 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestGetLastFlushedSequenceId.java
@@ -70,7 +70,7 @@ public class TestGetLastFlushedSequenceId {
@Test
public void test() throws IOException, InterruptedException {
- testUtil.getHBaseAdmin().createNamespace(
+ testUtil.getAdmin().createNamespace(
NamespaceDescriptor.create(tableName.getNamespaceAsString()).build());
Table table = testUtil.createTable(tableName, families);
table.put(new Put(Bytes.toBytes("k"))
@@ -94,7 +94,7 @@ public class TestGetLastFlushedSequenceId {
// This will be the sequenceid just before that of the earliest edit in memstore.
long storeSequenceId = ids.getStoreSequenceId(0).getSequenceId();
assertTrue(storeSequenceId > 0);
- testUtil.getHBaseAdmin().flush(tableName);
+ testUtil.getAdmin().flush(tableName);
Thread.sleep(2000);
ids =
testUtil.getHBaseCluster().getMaster()
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
index 19a5d8a..36784de 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMaster.java
@@ -69,7 +69,7 @@ public class TestMaster {
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 3);
// Start a cluster of two regionservers.
TEST_UTIL.startMiniCluster(2);
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
}
@AfterClass
@@ -99,7 +99,7 @@ public class TestMaster {
// Now trigger a split and stop when the split is in progress
LOG.info("Splitting table");
- TEST_UTIL.getHBaseAdmin().split(TABLENAME);
+ TEST_UTIL.getAdmin().split(TABLENAME);
LOG.info("Waiting for split result to be about to open");
RegionStates regionStates = m.getAssignmentManager().getRegionStates();
while (regionStates.getRegionsOfTable(TABLENAME).size() <= 1) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
index b62279e..d23c6f9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterRestartAfterDisablingTable.java
@@ -76,7 +76,7 @@ public class TestMasterRestartAfterDisablingTable {
log("Waiting for no more RIT\n");
TEST_UTIL.waitUntilNoRegionsInTransition(60000);
log("Disabling table\n");
- TEST_UTIL.getHBaseAdmin().disableTable(table);
+ TEST_UTIL.getAdmin().disableTable(table);
NavigableSet<String> regions = HBaseTestingUtility.getAllOnlineRegions(cluster);
assertEquals(
@@ -101,7 +101,7 @@ public class TestMasterRestartAfterDisablingTable {
TableState.State.DISABLING));
log("Enabling table\n");
// Need a new Admin, the previous one is on the old master
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.enableTable(table);
admin.close();
log("Waiting for no more RIT\n");
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
index 9d79c6c..900d3d3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestRollingRestart.java
@@ -85,7 +85,7 @@ public class TestRollingRestart {
log("Waiting for no more RIT\n");
TEST_UTIL.waitUntilNoRegionsInTransition(60000);
log("Disabling table\n");
- TEST_UTIL.getHBaseAdmin().disableTable(table);
+ TEST_UTIL.getAdmin().disableTable(table);
log("Waiting for no more RIT\n");
TEST_UTIL.waitUntilNoRegionsInTransition(60000);
NavigableSet<String> regions = HBaseTestingUtility.getAllOnlineRegions(cluster);
@@ -95,7 +95,7 @@ public class TestRollingRestart {
}
assertEquals(2, regions.size());
log("Enabling table\n");
- TEST_UTIL.getHBaseAdmin().enableTable(table);
+ TEST_UTIL.getAdmin().enableTable(table);
log("Waiting for no more RIT\n");
TEST_UTIL.waitUntilNoRegionsInTransition(60000);
log("Verifying there are " + numRegions + " assigned on cluster\n");
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java
index cb7337e..f33bc98 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestWarmupRegion.java
@@ -99,14 +99,14 @@ public class TestWarmupRegion {
}
// major compaction, purged future deletes
- TEST_UTIL.getHBaseAdmin().flush(TABLENAME);
- TEST_UTIL.getHBaseAdmin().majorCompact(TABLENAME);
+ TEST_UTIL.getAdmin().flush(TABLENAME);
+ TEST_UTIL.getAdmin().majorCompact(TABLENAME);
// waiting for the major compaction to complete
TEST_UTIL.waitFor(6000, new Waiter.Predicate<IOException>() {
@Override
public boolean evaluate() throws IOException {
- return TEST_UTIL.getHBaseAdmin().getCompactionState(TABLENAME) ==
+ return TEST_UTIL.getAdmin().getCompactionState(TABLENAME) ==
CompactionState.NONE;
}
});
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
index 0aeec0a..9c6b132 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestSnapshotFromMaster.java
@@ -137,7 +137,7 @@ public class TestSnapshotFromMaster {
@After
public void tearDown() throws Exception {
UTIL.deleteTable(TABLE_NAME);
- SnapshotTestingUtils.deleteAllSnapshots(UTIL.getHBaseAdmin());
+ SnapshotTestingUtils.deleteAllSnapshots(UTIL.getAdmin());
SnapshotTestingUtils.deleteArchiveDirectory(UTIL);
}
@@ -273,7 +273,7 @@ public class TestSnapshotFromMaster {
*/
@Test(timeout = 300000)
public void testSnapshotHFileArchiving() throws Exception {
- Admin admin = UTIL.getHBaseAdmin();
+ Admin admin = UTIL.getAdmin();
// make sure we don't fail on listing snapshots
SnapshotTestingUtils.assertNoSnapshots(admin);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
index f8bc6ab..ed28a0b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/normalizer/TestSimpleRegionNormalizerOnCluster.java
@@ -72,7 +72,7 @@ public class TestSimpleRegionNormalizerOnCluster {
// Start a cluster of two regionservers.
TEST_UTIL.startMiniCluster(1);
TestNamespaceAuditor.waitForQuotaEnabled(TEST_UTIL);
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
index efe63ea..fb2923a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestAddColumnFamilyProcedure.java
@@ -60,7 +60,7 @@ public class TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
tableName, cf1);
// Test 2: Add a column family offline
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
long procId2 = procExec.submitProcedure(
new AddColumnFamilyProcedure(procExec.getEnvironment(), tableName, columnDescriptor2));
// Wait the completion
@@ -103,7 +103,7 @@ public class TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
ProcedureTestingUtility.getExceptionCause(result) instanceof InvalidFamilyOperationException);
// Do the same add the existing column family - this time offline
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
long procId3 = procExec.submitProcedure(
new AddColumnFamilyProcedure(procExec.getEnvironment(), tableName, columnDescriptor));
// Wait the completion
@@ -125,7 +125,7 @@ public class TestAddColumnFamilyProcedure extends TestTableDDLProcedureBase {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
// create the table
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2", "f3");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
index 4304438..d8221bb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCloneSnapshotProcedure.java
@@ -56,7 +56,7 @@ public class TestCloneSnapshotProcedure extends TestTableDDLProcedureBase {
@Override
public void tearDown() throws Exception {
super.tearDown();
- SnapshotTestingUtils.deleteAllSnapshots(UTIL.getHBaseAdmin());
+ SnapshotTestingUtils.deleteAllSnapshots(UTIL.getAdmin());
snapshot = null;
}
@@ -66,7 +66,7 @@ public class TestCloneSnapshotProcedure extends TestTableDDLProcedureBase {
long tid = System.currentTimeMillis();
final byte[] snapshotName = Bytes.toBytes("snapshot-" + tid);
- Admin admin = UTIL.getHBaseAdmin();
+ Admin admin = UTIL.getAdmin();
// create Table
SnapshotTestingUtils.createTable(UTIL, snapshotTableName, getNumReplicas(), CF);
// Load data
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
index b219bd0..995d98d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestCreateNamespaceProcedure.java
@@ -123,7 +123,7 @@ public class TestCreateNamespaceProcedure {
@Test(timeout=60000)
public void testCreateSystemNamespace() throws Exception {
final NamespaceDescriptor nsd =
- UTIL.getHBaseAdmin().getNamespaceDescriptor(NamespaceDescriptor.SYSTEM_NAMESPACE.getName());
+ UTIL.getAdmin().getNamespaceDescriptor(NamespaceDescriptor.SYSTEM_NAMESPACE.getName());
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
long procId = procExec.submitProcedure(
@@ -217,7 +217,7 @@ public class TestCreateNamespaceProcedure {
// Validate the non-existence of namespace
try {
- NamespaceDescriptor nsDescriptor = UTIL.getHBaseAdmin().getNamespaceDescriptor(nsd.getName());
+ NamespaceDescriptor nsDescriptor = UTIL.getAdmin().getNamespaceDescriptor(nsd.getName());
assertNull(nsDescriptor);
} catch (NamespaceNotFoundException nsnfe) {
// Expected
@@ -231,7 +231,7 @@ public class TestCreateNamespaceProcedure {
private void validateNamespaceCreated(NamespaceDescriptor nsd) throws IOException {
NamespaceDescriptor createdNsDescriptor =
- UTIL.getHBaseAdmin().getNamespaceDescriptor(nsd.getName());
+ UTIL.getAdmin().getNamespaceDescriptor(nsd.getName());
assertNotNull(createdNsDescriptor);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
index 89ffcb0..390eacd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedure.java
@@ -58,7 +58,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
tableName, cf1);
// Test 2: delete the column family that exists offline
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
long procId2 = procExec.submitProcedure(
new DeleteColumnFamilyProcedure(procExec.getEnvironment(), tableName, cf2.getBytes()));
// Wait the completion
@@ -101,7 +101,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
ProcedureTestingUtility.getExceptionCause(result) instanceof InvalidFamilyOperationException);
// Try again, this time with table disabled.
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
long procId3 = procExec.submitProcedure(
new DeleteColumnFamilyProcedure(procExec.getEnvironment(), tableName, cf2.getBytes()));
// Wait the completion
@@ -145,7 +145,7 @@ public class TestDeleteColumnFamilyProcedure extends TestTableDDLProcedureBase {
// create the table
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2", "f3", cf4);
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedureFromClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedureFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedureFromClient.java
index fd17f30..899d114 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedureFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteColumnFamilyProcedureFromClient.java
@@ -98,7 +98,7 @@ public class TestDeleteColumnFamilyProcedureFromClient {
@Test
public void deleteColumnFamilyWithMultipleRegions() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HTableDescriptor beforehtd = admin.getTableDescriptor(TABLENAME);
FileSystem fs = TEST_UTIL.getDFSCluster().getFileSystem();
@@ -176,7 +176,7 @@ public class TestDeleteColumnFamilyProcedureFromClient {
@Test
public void deleteColumnFamilyTwice() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HTableDescriptor beforehtd = admin.getTableDescriptor(TABLENAME);
String cfToDelete = "cf1";
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
index a34d6d7..72a437c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteNamespaceProcedure.java
@@ -79,7 +79,7 @@ public class TestDeleteNamespaceProcedure {
@After
public void tearDown() throws Exception {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(getMasterProcedureExecutor(), false);
- for (HTableDescriptor htd: UTIL.getHBaseAdmin().listTables()) {
+ for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName());
}
@@ -197,7 +197,7 @@ public class TestDeleteNamespaceProcedure {
// Validate the namespace still exists
NamespaceDescriptor createdNsDescriptor=
- UTIL.getHBaseAdmin().getNamespaceDescriptor(namespaceName);
+ UTIL.getAdmin().getNamespaceDescriptor(namespaceName);
assertNotNull(createdNsDescriptor);
}
@@ -218,7 +218,7 @@ public class TestDeleteNamespaceProcedure {
public static void validateNamespaceNotExist(final String nsName) throws IOException {
try {
- NamespaceDescriptor nsDescriptor = UTIL.getHBaseAdmin().getNamespaceDescriptor(nsName);
+ NamespaceDescriptor nsDescriptor = UTIL.getAdmin().getNamespaceDescriptor(nsName);
assertNull(nsDescriptor);
} catch (NamespaceNotFoundException nsnfe) {
// Expected
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
index c259bb6..61746a1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestDeleteTableProcedure.java
@@ -70,7 +70,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
HRegionInfo[] regions = MasterProcedureTestingUtility.createTable(
procExec, tableName, null, "f");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
// delete the table (that exists)
long procId1 = procExec.submitProcedure(
@@ -114,7 +114,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
private void testSimpleDelete(final TableName tableName, byte[][] splitKeys) throws Exception {
HRegionInfo[] regions = MasterProcedureTestingUtility.createTable(
getMasterProcedureExecutor(), tableName, splitKeys, "f1", "f2");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
// delete the table
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -133,7 +133,7 @@ public class TestDeleteTableProcedure extends TestTableDDLProcedureBase {
byte[][] splitKeys = null;
HRegionInfo[] regions = MasterProcedureTestingUtility.createTable(
getMasterProcedureExecutor(), tableName, splitKeys, "f1", "f2");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
index b8b91b5..c1b42a9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestEnableTableProcedure.java
@@ -45,7 +45,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
// Enable the table
long procId = procExec.submitProcedure(
@@ -99,7 +99,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
};
MasterProcedureTestingUtility.createTable(procExec, tableName, splitKeys, "f1", "f2");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
@@ -123,7 +123,7 @@ public class TestEnableTableProcedure extends TestTableDDLProcedureBase {
Bytes.toBytes("a"), Bytes.toBytes("b"), Bytes.toBytes("c")
};
MasterProcedureTestingUtility.createTable(procExec, tableName, splitKeys, "f1", "f2");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
index e4f42d6..af48302 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterFailoverWithProcedures.java
@@ -145,7 +145,7 @@ public class TestMasterFailoverWithProcedures {
Path tableDir = FSUtils.getTableDir(getRootDir(), tableName);
MasterProcedureTestingUtility.validateTableCreation(
UTIL.getHBaseCluster().getMaster(), tableName, regions, "f1", "f2");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
ProcedureTestingUtility.setKillBeforeStoreUpdate(procExec, true);
@@ -189,7 +189,7 @@ public class TestMasterFailoverWithProcedures {
UTIL.getConnection(), tableName, 100, splitKeys, families);
assertEquals(100, UTIL.countRows(tableName));
// disable the table
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
@@ -203,7 +203,7 @@ public class TestMasterFailoverWithProcedures {
UTIL.waitUntilAllRegionsAssigned(tableName);
// validate the table regions and layout
- regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]);
+ regions = UTIL.getAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]);
if (preserveSplits) {
assertEquals(1 + splitKeys.length, regions.length);
} else {
@@ -280,7 +280,7 @@ public class TestMasterFailoverWithProcedures {
};
MasterProcedureTestingUtility.createTable(
getMasterProcedureExecutor(), tableName, splitKeys, "f1", "f2");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
index 450714f..4eedc9a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestMasterProcedureEvents.java
@@ -73,7 +73,7 @@ public class TestMasterProcedureEvents {
@After
public void tearDown() throws Exception {
- for (HTableDescriptor htd: UTIL.getHBaseAdmin().listTables()) {
+ for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName());
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
index 7758185..74c4ad5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyColumnFamilyProcedure.java
@@ -61,7 +61,7 @@ public class TestModifyColumnFamilyProcedure extends TestTableDDLProcedureBase {
.getMaster(), tableName, cf1, columnDescriptor);
// Test 2: modify the column family offline
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
columnDescriptor.setBlocksize(newBlockSize * 2);
long procId2 = procExec.submitProcedure(
new ModifyColumnFamilyProcedure(procExec.getEnvironment(), tableName, columnDescriptor));
@@ -110,7 +110,7 @@ public class TestModifyColumnFamilyProcedure extends TestTableDDLProcedureBase {
// create the table
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f1", "f2", cf3);
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
index 2c17089..1b53d23 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyNamespaceProcedure.java
@@ -75,7 +75,7 @@ public class TestModifyNamespaceProcedure {
@After
public void tearDown() throws Exception {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(getMasterProcedureExecutor(), false);
- for (HTableDescriptor htd: UTIL.getHBaseAdmin().listTables()) {
+ for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName());
}
@@ -97,7 +97,7 @@ public class TestModifyNamespaceProcedure {
// Before modify
NamespaceDescriptor currentNsDescriptor =
- UTIL.getHBaseAdmin().getNamespaceDescriptor(nsd.getName());
+ UTIL.getAdmin().getNamespaceDescriptor(nsd.getName());
assertEquals(currentNsDescriptor.getConfigurationValue(nsKey1), nsValue1before);
assertNull(currentNsDescriptor.getConfigurationValue(nsKey2));
@@ -113,7 +113,7 @@ public class TestModifyNamespaceProcedure {
// Verify the namespace is updated.
currentNsDescriptor =
- UTIL.getHBaseAdmin().getNamespaceDescriptor(nsd.getName());
+ UTIL.getAdmin().getNamespaceDescriptor(nsd.getName());
assertEquals(nsd.getConfigurationValue(nsKey1), nsValue1after);
assertEquals(currentNsDescriptor.getConfigurationValue(nsKey2), nsValue2);
}
@@ -124,7 +124,7 @@ public class TestModifyNamespaceProcedure {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
try {
- NamespaceDescriptor nsDescriptor = UTIL.getHBaseAdmin().getNamespaceDescriptor(namespaceName);
+ NamespaceDescriptor nsDescriptor = UTIL.getAdmin().getNamespaceDescriptor(namespaceName);
assertNull(nsDescriptor);
} catch (NamespaceNotFoundException nsnfe) {
// Expected
@@ -218,7 +218,7 @@ public class TestModifyNamespaceProcedure {
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);
// Validate
NamespaceDescriptor currentNsDescriptor =
- UTIL.getHBaseAdmin().getNamespaceDescriptor(nsd.getName());
+ UTIL.getAdmin().getNamespaceDescriptor(nsd.getName());
assertEquals(currentNsDescriptor.getConfigurationValue(nsKey), nsValue);
}
@@ -246,7 +246,7 @@ public class TestModifyNamespaceProcedure {
// Validate
NamespaceDescriptor currentNsDescriptor =
- UTIL.getHBaseAdmin().getNamespaceDescriptor(nsd.getName());
+ UTIL.getAdmin().getNamespaceDescriptor(nsd.getName());
assertNull(currentNsDescriptor.getConfigurationValue(nsKey));
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
index 7ebb075..ea9bea2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestModifyTableProcedure.java
@@ -45,10 +45,10 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
// Modify the table descriptor
- HTableDescriptor htd = new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
// Test 1: Modify 1 property
long newMaxFileSize = htd.getMaxFileSize() * 2;
@@ -59,7 +59,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId1));
- HTableDescriptor currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(newMaxFileSize, currentHtd.getMaxFileSize());
// Test 2: Modify multiple properties
@@ -72,7 +72,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));
- currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(newReadOnlyOption, currentHtd.isReadOnly());
assertEquals(newMemStoreFlushSize, currentHtd.getMemStoreFlushSize());
}
@@ -83,28 +83,28 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "cf1");
- HTableDescriptor currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(1, currentHtd.getFamiliesKeys().size());
// Test 1: Modify the table descriptor online
String cf2 = "cf2";
- HTableDescriptor htd = new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
htd.addFamily(new HColumnDescriptor(cf2));
long procId = ProcedureTestingUtility.submitAndWait(
procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));
- currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(2, currentHtd.getFamiliesKeys().size());
assertTrue(currentHtd.hasFamily(cf2.getBytes()));
// Test 2: Modify the table descriptor offline
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
String cf3 = "cf3";
HTableDescriptor htd2 =
- new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
htd2.addFamily(new HColumnDescriptor(cf3));
long procId2 =
@@ -112,7 +112,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
new ModifyTableProcedure(procExec.getEnvironment(), htd2));
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));
- currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertTrue(currentHtd.hasFamily(cf3.getBytes()));
assertEquals(3, currentHtd.getFamiliesKeys().size());
}
@@ -126,27 +126,27 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
MasterProcedureTestingUtility.createTable(procExec, tableName, null, cf1, cf2, cf3);
- HTableDescriptor currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(3, currentHtd.getFamiliesKeys().size());
// Test 1: Modify the table descriptor
- HTableDescriptor htd = new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
htd.removeFamily(cf2.getBytes());
long procId = ProcedureTestingUtility.submitAndWait(
procExec, new ModifyTableProcedure(procExec.getEnvironment(), htd));
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId));
- currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(2, currentHtd.getFamiliesKeys().size());
assertFalse(currentHtd.hasFamily(cf2.getBytes()));
// Test 2: Modify the table descriptor offline
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
HTableDescriptor htd2 =
- new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
htd2.removeFamily(cf3.getBytes());
// Disable Sanity check
htd2.setConfiguration("hbase.table.sanity.checks", Boolean.FALSE.toString());
@@ -156,13 +156,13 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
new ModifyTableProcedure(procExec.getEnvironment(), htd2));
ProcedureTestingUtility.assertProcNotFailed(procExec.getResult(procId2));
- currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(1, currentHtd.getFamiliesKeys().size());
assertFalse(currentHtd.hasFamily(cf3.getBytes()));
//Removing the last family will fail
HTableDescriptor htd3 =
- new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
htd3.removeFamily(cf1.getBytes());
long procId3 =
ProcedureTestingUtility.submitAndWait(procExec,
@@ -186,13 +186,13 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
// create the table
HRegionInfo[] regions = MasterProcedureTestingUtility.createTable(
procExec, tableName, null, "cf1", cf3);
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
// Modify multiple properties of the table.
- HTableDescriptor htd = new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;
htd.setCompactionEnabled(newCompactionEnableOption);
htd.addFamily(new HColumnDescriptor(cf2));
@@ -208,7 +208,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId, numberOfSteps);
// Validate descriptor
- HTableDescriptor currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(newCompactionEnableOption, currentHtd.isCompactionEnabled());
assertEquals(2, currentHtd.getFamiliesKeys().size());
@@ -231,7 +231,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
// Modify multiple properties of the table.
- HTableDescriptor htd = new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;
htd.setCompactionEnabled(newCompactionEnableOption);
htd.addFamily(new HColumnDescriptor(cf2));
@@ -246,7 +246,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
MasterProcedureTestingUtility.testRecoveryAndDoubleExecution(procExec, procId, numberOfSteps);
// Validate descriptor
- HTableDescriptor currentHtd = UTIL.getHBaseAdmin().getTableDescriptor(tableName);
+ HTableDescriptor currentHtd = UTIL.getAdmin().getTableDescriptor(tableName);
assertEquals(newCompactionEnableOption, currentHtd.isCompactionEnabled());
assertEquals(2, currentHtd.getFamiliesKeys().size());
assertTrue(currentHtd.hasFamily(cf2.getBytes()));
@@ -269,7 +269,7 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
- HTableDescriptor htd = new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;
htd.setCompactionEnabled(newCompactionEnableOption);
htd.addFamily(new HColumnDescriptor(familyName));
@@ -295,12 +295,12 @@ public class TestModifyTableProcedure extends TestTableDDLProcedureBase {
// create the table
HRegionInfo[] regions = MasterProcedureTestingUtility.createTable(
procExec, tableName, null, "cf1");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
- HTableDescriptor htd = new HTableDescriptor(UTIL.getHBaseAdmin().getTableDescriptor(tableName));
+ HTableDescriptor htd = new HTableDescriptor(UTIL.getAdmin().getTableDescriptor(tableName));
boolean newCompactionEnableOption = htd.isCompactionEnabled() ? false : true;
htd.setCompactionEnabled(newCompactionEnableOption);
htd.addFamily(new HColumnDescriptor(familyName));
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
index 6233254..3652bdb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestProcedureAdmin.java
@@ -80,7 +80,7 @@ public class TestProcedureAdmin {
public void tearDown() throws Exception {
assertTrue("expected executor to be running", getMasterProcedureExecutor().isRunning());
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(getMasterProcedureExecutor(), false);
- for (HTableDescriptor htd: UTIL.getHBaseAdmin().listTables()) {
+ for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName());
}
@@ -118,7 +118,7 @@ public class TestProcedureAdmin {
HRegionInfo[] regions =
MasterProcedureTestingUtility.createTable(procExec, tableName, null, "f");
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(procExec, true);
// Submit an un-abortable procedure
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
index 4b5ff89..8025ca6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestRestoreSnapshotProcedure.java
@@ -79,7 +79,7 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
@Override
public void tearDown() throws Exception {
super.tearDown();
- SnapshotTestingUtils.deleteAllSnapshots(UTIL.getHBaseAdmin());
+ SnapshotTestingUtils.deleteAllSnapshots(UTIL.getAdmin());
SnapshotTestingUtils.deleteArchiveDirectory(UTIL);
}
@@ -90,7 +90,7 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
private void setupSnapshotAndUpdateTable() throws Exception {
long tid = System.currentTimeMillis();
final byte[] snapshotName = Bytes.toBytes("snapshot-" + tid);
- Admin admin = UTIL.getHBaseAdmin();
+ Admin admin = UTIL.getAdmin();
// create Table
SnapshotTestingUtils.createTable(UTIL, snapshotTableName, getNumReplicas(), CF1, CF2);
// Load data
@@ -170,7 +170,7 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
try {
- UTIL.getHBaseAdmin().enableTable(snapshotTableName);
+ UTIL.getAdmin().enableTable(snapshotTableName);
long procId = ProcedureTestingUtility.submitAndWait(
procExec,
@@ -181,7 +181,7 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
assertTrue(
ProcedureTestingUtility.getExceptionCause(result) instanceof TableNotDisabledException);
} finally {
- UTIL.getHBaseAdmin().disableTable(snapshotTableName);
+ UTIL.getAdmin().disableTable(snapshotTableName);
}
}
@@ -205,9 +205,9 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
private void validateSnapshotRestore() throws IOException {
try {
- UTIL.getHBaseAdmin().enableTable(snapshotTableName);
+ UTIL.getAdmin().enableTable(snapshotTableName);
- HTableDescriptor currentHTD = UTIL.getHBaseAdmin().getTableDescriptor(snapshotTableName);
+ HTableDescriptor currentHTD = UTIL.getAdmin().getTableDescriptor(snapshotTableName);
assertTrue(currentHTD.hasFamily(CF1));
assertTrue(currentHTD.hasFamily(CF2));
assertFalse(currentHTD.hasFamily(CF3));
@@ -215,7 +215,7 @@ public class TestRestoreSnapshotProcedure extends TestTableDDLProcedureBase {
assertEquals(currentHTD.getFamiliesKeys().size(), snapshotHTD.getFamiliesKeys().size());
SnapshotTestingUtils.verifyRowCount(UTIL, snapshotTableName, rowCountCF1 + rowCountCF2);
} finally {
- UTIL.getHBaseAdmin().disableTable(snapshotTableName);
+ UTIL.getAdmin().disableTable(snapshotTableName);
}
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
index 9e75cb9..8977412 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestSplitTableRegionProcedure.java
@@ -94,7 +94,7 @@ public class TestSplitTableRegionProcedure {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(getMasterProcedureExecutor(), false);
// Turn off balancer so it doesn't cut in and mess up our placements.
- UTIL.getHBaseAdmin().setBalancerRunning(false, true);
+ UTIL.getAdmin().setBalancerRunning(false, true);
// Turn off the meta scanner so it don't remove parent on us.
UTIL.getHBaseCluster().getMaster().setCatalogJanitorEnabled(false);
}
@@ -102,7 +102,7 @@ public class TestSplitTableRegionProcedure {
@After
public void tearDown() throws Exception {
ProcedureTestingUtility.setKillAndToggleBeforeStoreUpdate(getMasterProcedureExecutor(), false);
- for (HTableDescriptor htd: UTIL.getHBaseAdmin().listTables()) {
+ for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName());
}
@@ -233,12 +233,12 @@ public class TestSplitTableRegionProcedure {
ProcedureTestingUtility.waitProcedure(procExec, procId);
ProcedureTestingUtility.assertProcNotFailed(procExec, procId);
- UTIL.getHBaseAdmin().majorCompact(tableName);
+ UTIL.getAdmin().majorCompact(tableName);
// waiting for the major compaction to complete
UTIL.waitFor(6000, new Waiter.Predicate<IOException>() {
@Override
public boolean evaluate() throws IOException {
- return UTIL.getHBaseAdmin().getCompactionState(tableName) == CompactionState.NONE;
+ return UTIL.getAdmin().getCompactionState(tableName) == CompactionState.NONE;
}
});
@@ -345,7 +345,7 @@ public class TestSplitTableRegionProcedure {
p.addColumn(Bytes.toBytes(ColumnFamilyName2), Bytes.toBytes("q2"), Bytes.toBytes(i));
t.put(p);
if (i % 5 == 0) {
- UTIL.getHBaseAdmin().flush(tableName);
+ UTIL.getAdmin().flush(tableName);
}
}
}
@@ -360,7 +360,7 @@ public class TestSplitTableRegionProcedure {
d = new Delete(Bytes.toBytes("" + i));
t.delete(d);
if (i % 5 == 0) {
- UTIL.getHBaseAdmin().flush(tableName);
+ UTIL.getAdmin().flush(tableName);
}
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
index a0b69b9..f453a67 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDDLProcedureBase.java
@@ -62,7 +62,7 @@ public abstract class TestTableDDLProcedureBase {
@After
public void tearDown() throws Exception {
resetProcExecutorTestingKillFlag();
- for (HTableDescriptor htd: UTIL.getHBaseAdmin().listTables()) {
+ for (HTableDescriptor htd: UTIL.getAdmin().listTables()) {
LOG.info("Tear down, remove table=" + htd.getTableName());
UTIL.deleteTable(htd.getTableName());
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDescriptorModificationFromClient.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDescriptorModificationFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDescriptorModificationFromClient.java
index 417987b..77e1fc9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDescriptorModificationFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTableDescriptorModificationFromClient.java
@@ -83,7 +83,7 @@ public class TestTableDescriptorModificationFromClient {
@Test
public void testModifyTable() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
// Create a table with one family
HTableDescriptor baseHtd = new HTableDescriptor(TABLE_NAME);
baseHtd.addFamily(new HColumnDescriptor(FAMILY_0));
@@ -106,7 +106,7 @@ public class TestTableDescriptorModificationFromClient {
@Test
public void testAddColumn() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
// Create a table with two families
HTableDescriptor baseHtd = new HTableDescriptor(TABLE_NAME);
baseHtd.addFamily(new HColumnDescriptor(FAMILY_0));
@@ -126,7 +126,7 @@ public class TestTableDescriptorModificationFromClient {
@Test
public void testAddSameColumnFamilyTwice() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
// Create a table with one families
HTableDescriptor baseHtd = new HTableDescriptor(TABLE_NAME);
baseHtd.addFamily(new HColumnDescriptor(FAMILY_0));
@@ -155,7 +155,7 @@ public class TestTableDescriptorModificationFromClient {
@Test
public void testModifyColumnFamily() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HColumnDescriptor cfDescriptor = new HColumnDescriptor(FAMILY_0);
int blockSize = cfDescriptor.getBlocksize();
@@ -184,7 +184,7 @@ public class TestTableDescriptorModificationFromClient {
@Test
public void testModifyNonExistingColumnFamily() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HColumnDescriptor cfDescriptor = new HColumnDescriptor(FAMILY_1);
int blockSize = cfDescriptor.getBlocksize();
@@ -215,7 +215,7 @@ public class TestTableDescriptorModificationFromClient {
@Test
public void testDeleteColumn() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
// Create a table with two families
HTableDescriptor baseHtd = new HTableDescriptor(TABLE_NAME);
baseHtd.addFamily(new HColumnDescriptor(FAMILY_0));
@@ -236,7 +236,7 @@ public class TestTableDescriptorModificationFromClient {
@Test
public void testDeleteSameColumnFamilyTwice() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
// Create a table with two families
HTableDescriptor baseHtd = new HTableDescriptor(TABLE_NAME);
baseHtd.addFamily(new HColumnDescriptor(FAMILY_0));
@@ -265,7 +265,7 @@ public class TestTableDescriptorModificationFromClient {
private void verifyTableDescriptor(final TableName tableName,
final byte[]... families) throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
// Verify descriptor from master
HTableDescriptor htd = admin.getTableDescriptor(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
index 7d88a85..56b8175 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/procedure/TestTruncateTableProcedure.java
@@ -99,7 +99,7 @@ public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
UTIL.getConnection(), tableName, 100, splitKeys, families);
assertEquals(100, UTIL.countRows(tableName));
// disable the table
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
// truncate the table
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
@@ -110,7 +110,7 @@ public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
UTIL.waitUntilAllRegionsAssigned(tableName);
// validate the table regions and layout
- regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]);
+ regions = UTIL.getAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]);
if (preserveSplits) {
assertEquals(1 + splitKeys.length, regions.length);
} else {
@@ -155,7 +155,7 @@ public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
UTIL.getConnection(), tableName, 100, splitKeys, families);
assertEquals(100, UTIL.countRows(tableName));
// disable the table
- UTIL.getHBaseAdmin().disableTable(tableName);
+ UTIL.getAdmin().disableTable(tableName);
final ProcedureExecutor<MasterProcedureEnv> procExec = getMasterProcedureExecutor();
ProcedureTestingUtility.waitNoProcedureRunning(procExec);
@@ -174,7 +174,7 @@ public class TestTruncateTableProcedure extends TestTableDDLProcedureBase {
UTIL.waitUntilAllRegionsAssigned(tableName);
// validate the table regions and layout
- regions = UTIL.getHBaseAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]);
+ regions = UTIL.getAdmin().getTableRegions(tableName).toArray(new HRegionInfo[0]);
if (preserveSplits) {
assertEquals(1 + splitKeys.length, regions.length);
} else {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
index e74b3de..5efb509 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestExpiredMobFileCleaner.java
@@ -83,7 +83,7 @@ public class TestExpiredMobFileCleaner {
hcd.setMaxVersions(4);
desc.addFamily(hcd);
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
admin.createTable(desc);
table = ConnectionFactory.createConnection(TEST_UTIL.getConfiguration())
.getBufferedMutator(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
index 1f8bcb2..d9fc9f6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/TestMobDataBlockEncoding.java
@@ -72,7 +72,7 @@ public class TestMobDataBlockEncoding {
hcd.setMaxVersions(4);
hcd.setDataBlockEncoding(encoding);
desc.addFamily(hcd);
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
admin.createTable(desc);
table = ConnectionFactory.createConnection(TEST_UTIL.getConfiguration())
.getTable(TableName.valueOf(TN));
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
index 1630e2d..0739271 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mob/compactions/TestMobCompactor.java
@@ -133,7 +133,7 @@ public class TestMobCompactor {
conn = ConnectionFactory.createConnection(TEST_UTIL.getConfiguration(), pool);
fs = TEST_UTIL.getTestFileSystem();
conf = TEST_UTIL.getConfiguration();
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
index f8a1a93..0190b8f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/namespace/TestNamespaceAuditor.java
@@ -114,7 +114,7 @@ public class TestNamespaceAuditor {
RegionServerObserver.class);
UTIL.startMiniCluster(1, 1);
waitForQuotaEnabled(UTIL);
- ADMIN = UTIL.getHBaseAdmin();
+ ADMIN = UTIL.getAdmin();
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java
index cbcc166..b52a8d6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/procedure/TestProcedureManager.java
@@ -61,7 +61,7 @@ public class TestProcedureManager {
@Test
public void testSimpleProcedureManager() throws IOException {
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
byte[] result = admin.execProcedureWithRet(SimpleMasterProcedureManager.SIMPLE_SIGNATURE,
"mytest", new HashMap<String, String>());
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java
index d6e8952..ef26c25 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java
@@ -67,7 +67,7 @@ public class TestQuotaAdmin {
@Test
public void testThrottleType() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
String userName = User.getCurrent().getShortName();
admin.setQuota(QuotaSettingsFactory
@@ -115,7 +115,7 @@ public class TestQuotaAdmin {
@Test
public void testSimpleScan() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
String userName = User.getCurrent().getShortName();
admin.setQuota(QuotaSettingsFactory
@@ -156,7 +156,7 @@ public class TestQuotaAdmin {
@Test
public void testQuotaRetrieverFilter() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
TableName[] tables = new TableName[] {
TableName.valueOf("T0"), TableName.valueOf("T01"), TableName.valueOf("NS0:T2"),
};
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaThrottle.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaThrottle.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaThrottle.java
index 0c06588..91c2d80 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaThrottle.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestQuotaThrottle.java
@@ -115,7 +115,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserGlobalThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
// Add 6req/min limit
@@ -139,7 +139,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserGlobalReadAndWriteThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
// Add 6req/min limit for read request
@@ -171,7 +171,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserTableThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
// Add 6req/min limit
@@ -196,7 +196,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserTableReadAndWriteThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
// Add 6req/min limit for write request on tables[0]
@@ -237,7 +237,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserNamespaceThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
final String NAMESPACE = "default";
@@ -262,7 +262,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserNamespaceReadAndWriteThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
final String NAMESPACE = "default";
@@ -295,7 +295,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testTableGlobalThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
// Add 6req/min limit
admin.setQuota(QuotaSettingsFactory
@@ -319,7 +319,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testTableGlobalReadAndWriteThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
// Add 6req/min limit for read request
admin.setQuota(QuotaSettingsFactory
@@ -356,7 +356,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testNamespaceGlobalThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String NAMESPACE = "default";
// Add 6req/min limit
@@ -378,7 +378,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testNamespaceGlobalReadAndWriteThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String NAMESPACE = "default";
// Add 6req/min limit for write request
@@ -409,7 +409,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserAndTableThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
// Add 6req/min limit for the user on tables[0]
@@ -458,7 +458,7 @@ public class TestQuotaThrottle {
@Test(timeout=60000)
public void testUserGlobalBypassThrottle() throws Exception {
- final Admin admin = TEST_UTIL.getHBaseAdmin();
+ final Admin admin = TEST_UTIL.getAdmin();
final String userName = User.getCurrent().getShortName();
final String NAMESPACE = "default";
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
index 6c851de..c7b6c7c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
@@ -105,7 +105,7 @@ public class TestCompactSplitThread {
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);
@@ -155,8 +155,6 @@ public class TestCompactSplitThread {
@Test(timeout = 60000)
public void testFlushWithTableCompactionDisabled() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
-
HTableDescriptor htd = new HTableDescriptor(tableName);
htd.setCompactionEnabled(false);
TEST_UTIL.createTable(htd, new byte[][] { family }, null);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java
index d6302b3..9e83afb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionState.java
@@ -89,7 +89,7 @@ public class TestCompactionState {
Table ht = null;
try {
ht = TEST_UTIL.createTable(table, family);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
try {
admin.compact(table, fakecf);
} catch (IOException ioe) {
@@ -137,7 +137,7 @@ public class TestCompactionState {
int countBefore = countStoreFilesInFamilies(regions, families);
int countBeforeSingleFamily = countStoreFilesInFamily(regions, family);
assertTrue(countBefore > 0); // there should be some data files
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (expectedState == CompactionState.MINOR) {
if (singleFamily) {
admin.compact(table, family);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
index fe2cb44..b0f3468 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestDeleteMobTable.java
@@ -93,7 +93,7 @@ public class TestDeleteMobTable {
table.put(put);
// create an hfile
- TEST_UTIL.getHBaseAdmin().flush(htd.getTableName());
+ TEST_UTIL.getAdmin().flush(htd.getTableName());
} catch (IOException e) {
table.close();
throw e;
@@ -121,7 +121,7 @@ public class TestDeleteMobTable {
TEST_UTIL.deleteTable(tn);
}
- Assert.assertFalse(TEST_UTIL.getHBaseAdmin().tableExists(tn));
+ Assert.assertFalse(TEST_UTIL.getAdmin().tableExists(tn));
Assert.assertEquals(0, countMobFiles(tn, hcd.getNameAsString()));
Assert.assertEquals(1, countArchiveMobFiles(tn, hcd.getNameAsString()));
Assert.assertTrue(mobArchiveExist(tn, hcd.getNameAsString(), fileName));
@@ -145,7 +145,7 @@ public class TestDeleteMobTable {
TEST_UTIL.deleteTable(tn);
}
- Assert.assertFalse(TEST_UTIL.getHBaseAdmin().tableExists(tn));
+ Assert.assertFalse(TEST_UTIL.getAdmin().tableExists(tn));
Assert.assertEquals(0, countMobFiles(tn, hcd.getNameAsString()));
Assert.assertEquals(0, countArchiveMobFiles(tn, hcd.getNameAsString()));
Assert.assertFalse(mobTableDirExist(tn));
@@ -167,7 +167,7 @@ public class TestDeleteMobTable {
Assert.assertFalse(mobArchiveExist(tn, hcd.getNameAsString(), fileName));
Assert.assertTrue(mobTableDirExist(tn));
- TEST_UTIL.getHBaseAdmin().deleteColumnFamily(tn, FAMILY);
+ TEST_UTIL.getAdmin().deleteColumnFamily(tn, FAMILY);
Assert.assertEquals(0, countMobFiles(tn, hcd.getNameAsString()));
Assert.assertEquals(1, countArchiveMobFiles(tn, hcd.getNameAsString()));
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java
index cee64e0..a5134ce 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java
@@ -118,11 +118,11 @@ public class TestEncryptionKeyRotation {
hcd.setEncryptionKey(EncryptionUtil.wrapKey(conf,
conf.get(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY, User.getCurrent().getShortName()),
secondCFKey));
- TEST_UTIL.getHBaseAdmin().modifyColumnFamily(htd.getTableName(), hcd);
+ TEST_UTIL.getAdmin().modifyColumnFamily(htd.getTableName(), hcd);
Thread.sleep(5000); // Need a predicate for online schema change
// And major compact
- TEST_UTIL.getHBaseAdmin().majorCompact(htd.getTableName());
+ TEST_UTIL.getAdmin().majorCompact(htd.getTableName());
final List<Path> updatePaths = findCompactedStorefilePaths(htd.getTableName());
TEST_UTIL.waitFor(30000, 1000, true, new Predicate<Exception>() {
@Override
@@ -261,7 +261,7 @@ public class TestEncryptionKeyRotation {
private void createTableAndFlush(HTableDescriptor htd) throws Exception {
HColumnDescriptor hcd = htd.getFamilies().iterator().next();
// Create the test table
- TEST_UTIL.getHBaseAdmin().createTable(htd);
+ TEST_UTIL.getAdmin().createTable(htd);
TEST_UTIL.waitTableAvailable(htd.getName(), 5000);
// Create a store file
Table table = TEST_UTIL.getConnection().getTable(htd.getTableName());
@@ -271,7 +271,7 @@ public class TestEncryptionKeyRotation {
} finally {
table.close();
}
- TEST_UTIL.getHBaseAdmin().flush(htd.getTableName());
+ TEST_UTIL.getAdmin().flush(htd.getTableName());
}
private static byte[] extractHFileKey(Path path) throws Exception {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java
index ad7cf2f..760bdac 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionRandomKeying.java
@@ -100,7 +100,7 @@ public class TestEncryptionRandomKeying {
TEST_UTIL.startMiniCluster(1);
// Create the test table
- TEST_UTIL.getHBaseAdmin().createTable(htd);
+ TEST_UTIL.getAdmin().createTable(htd);
TEST_UTIL.waitTableAvailable(htd.getName(), 5000);
// Create a store file
@@ -111,7 +111,7 @@ public class TestEncryptionRandomKeying {
} finally {
table.close();
}
- TEST_UTIL.getHBaseAdmin().flush(htd.getTableName());
+ TEST_UTIL.getAdmin().flush(htd.getTableName());
}
@AfterClass
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
index c722621..cb4f1c3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEndToEndSplitTransaction.java
@@ -140,7 +140,7 @@ public class TestEndToEndSplitTransaction {
this.table = table;
this.tableName = table.getName();
this.family = table.getTableDescriptor().getFamiliesKeys().iterator().next();
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);
connection = TEST_UTIL.getConnection();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
index 55f882a..920f172 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestFSErrorsExposed.java
@@ -189,7 +189,7 @@ public class TestFSErrorsExposed {
TableName tableName = TableName.valueOf("table");
byte[] fam = Bytes.toBytes("fam");
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
HTableDescriptor desc = new HTableDescriptor(tableName);
desc.addFamily(new HColumnDescriptor(fam)
.setMaxVersions(1)