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:39 UTC
[5/5] hbase git commit: HBASE-17555 Changed calls to deprecated
getHBaseAdmin to getAdmin
HBASE-17555 Changed calls to deprecated getHBaseAdmin to getAdmin
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aff8de83
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aff8de83
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aff8de83
Branch: refs/heads/master
Commit: aff8de8397acf540f25dfffccce7a081d0f31fc1
Parents: 87e1ba9
Author: Jan Hentschel <ja...@ultratendency.com>
Authored: Fri Jan 27 09:06:52 2017 +0100
Committer: Michael Stack <st...@apache.org>
Committed: Sat Jan 28 21:41:25 2017 -0800
----------------------------------------------------------------------
.../exemplars/client/TestHelloHBase.java | 8 +-
.../exemplars/shaded_client/TestHelloHBase.java | 4 +-
.../TestBatchCoprocessorEndpoint.java | 2 +-
.../hbase/coprocessor/TestClassLoading.java | 10 +-
.../coprocessor/TestCoprocessorEndpoint.java | 6 +-
.../TestCoprocessorTableEndpoint.java | 4 +-
.../TestRegionServerCoprocessorEndpoint.java | 4 +-
.../coprocessor/TestRowProcessorEndpoint.java | 4 +-
.../hadoop/hbase/IntegrationTestIngest.java | 2 +-
.../IntegrationTestIngestWithEncryption.java | 2 +-
.../hbase/IntegrationTestLazyCfLoading.java | 4 +-
.../hbase/IntegrationTestManyRegions.java | 2 +-
.../hbase/IntegrationTestRegionReplicaPerf.java | 10 +-
.../hadoop/hbase/IntegrationTestingUtility.java | 2 +-
.../StripeCompactionsPerformanceEvaluation.java | 10 +-
.../hadoop/hbase/chaos/actions/Action.java | 4 +-
.../hbase/chaos/actions/AddColumnAction.java | 2 +-
.../chaos/actions/ChangeBloomFilterAction.java | 2 +-
.../chaos/actions/ChangeCompressionAction.java | 2 +-
.../chaos/actions/ChangeEncodingAction.java | 2 +-
.../chaos/actions/ChangeSplitPolicyAction.java | 2 +-
.../chaos/actions/ChangeVersionsAction.java | 2 +-
.../hbase/chaos/actions/CompactMobAction.java | 2 +-
.../CompactRandomRegionOfTableAction.java | 2 +-
.../hbase/chaos/actions/CompactTableAction.java | 2 +-
.../actions/DecreaseMaxHFileSizeAction.java | 2 +-
.../actions/FlushRandomRegionOfTableAction.java | 2 +-
.../hbase/chaos/actions/FlushTableAction.java | 2 +-
...MergeRandomAdjacentRegionsOfTableAction.java | 2 +-
.../actions/MoveRandomRegionOfTableAction.java | 2 +-
.../chaos/actions/MoveRegionsOfTableAction.java | 2 +-
.../hbase/chaos/actions/RemoveColumnAction.java | 2 +-
.../chaos/actions/SnapshotTableAction.java | 2 +-
.../actions/SplitAllRegionOfTableAction.java | 2 +-
.../actions/SplitRandomRegionOfTableAction.java | 2 +-
.../chaos/actions/TruncateTableAction.java | 2 +-
.../mapreduce/IntegrationTestBulkLoad.java | 8 +-
.../hadoop/hbase/mttr/IntegrationTestMTTR.java | 8 +-
.../hbase/rsgroup/IntegrationTestRSGroup.java | 2 +-
.../test/IntegrationTestLoadAndVerify.java | 2 +-
...stTimeBoundedRequestsWithRegionReplicas.java | 2 +-
.../trace/IntegrationTestSendTraceRequests.java | 2 +-
.../hadoop/hbase/rest/RowResourceBase.java | 4 +-
.../hadoop/hbase/rest/TestGzipFilter.java | 2 +-
.../hadoop/hbase/rest/TestMultiRowResource.java | 2 +-
.../rest/TestNamespacesInstanceResource.java | 10 +-
.../hbase/rest/TestNamespacesResource.java | 4 +-
.../hadoop/hbase/rest/TestScannerResource.java | 2 +-
.../hbase/rest/TestScannersWithFilters.java | 2 +-
.../hbase/rest/TestScannersWithLabels.java | 2 +-
.../hadoop/hbase/rest/TestSchemaResource.java | 4 +-
.../hadoop/hbase/rest/TestTableResource.java | 2 +-
.../apache/hadoop/hbase/rest/TestTableScan.java | 6 +-
.../hbase/rest/client/TestRemoteTable.java | 2 +-
.../hadoop/hbase/rsgroup/TestRSGroups.java | 2 +-
.../hadoop/hbase/rsgroup/TestRSGroupsBase.java | 10 +-
.../hbase/rsgroup/TestRSGroupsOfflineMode.java | 6 +-
.../apache/hadoop/hbase/TestAcidGuarantees.java | 6 +-
.../TestHColumnDescriptorDefaultVersions.java | 8 +-
.../hadoop/hbase/TestMetaTableAccessor.java | 2 +-
.../apache/hadoop/hbase/TestMultiVersions.java | 2 +-
.../org/apache/hadoop/hbase/TestNamespace.java | 2 +-
.../org/apache/hadoop/hbase/TestZooKeeper.java | 6 +-
.../hadoop/hbase/backup/TestHFileArchiving.java | 8 +-
.../client/TestBlockEvictionFromClient.java | 6 +-
.../client/TestClientOperationInterrupt.java | 2 +-
.../client/TestCloneSnapshotFromClient.java | 2 +-
.../hadoop/hbase/client/TestEnableTable.java | 12 +-
.../hadoop/hbase/client/TestFastFail.java | 4 +-
.../hadoop/hbase/client/TestFromClientSide.java | 28 ++--
.../hbase/client/TestFromClientSide3.java | 8 +-
.../org/apache/hadoop/hbase/client/TestHCM.java | 22 +--
.../client/TestHTableMultiplexerFlushCache.java | 2 +-
.../client/TestIllegalTableDescriptor.java | 4 +-
.../hadoop/hbase/client/TestLeaseRenewal.java | 2 +-
.../hbase/client/TestMetaWithReplicas.java | 32 ++---
.../client/TestMobCloneSnapshotFromClient.java | 4 +-
.../hbase/client/TestMultiRespectsLimits.java | 2 +-
.../hbase/client/TestReplicaWithCluster.java | 30 ++--
.../hadoop/hbase/client/TestReplicasClient.java | 2 +-
.../client/TestRestoreSnapshotFromClient.java | 4 +-
.../hadoop/hbase/client/TestScannerTimeout.java | 2 +-
.../hadoop/hbase/client/TestSizeFailures.java | 2 +-
.../client/TestSnapshotCloneIndependence.java | 4 +-
.../hbase/client/TestSnapshotFromClient.java | 20 +--
.../hbase/client/TestSnapshotMetadata.java | 2 +-
.../hbase/client/TestTableSnapshotScanner.java | 4 +-
.../hadoop/hbase/constraint/TestConstraint.java | 14 +-
...TestMasterCoprocessorExceptionWithAbort.java | 2 +-
...estMasterCoprocessorExceptionWithRemove.java | 4 +-
.../hbase/coprocessor/TestMasterObserver.java | 6 +-
.../coprocessor/TestOpenTableInCoprocessor.java | 10 +-
.../coprocessor/TestRegionObserverBypass.java | 2 +-
.../TestRegionObserverScannerOpenHook.java | 2 +-
.../hbase/filter/FilterTestingCluster.java | 2 +-
.../hadoop/hbase/filter/TestFilterWrapper.java | 2 +-
.../hadoop/hbase/fs/TestBlockReorder.java | 2 +-
.../hbase/io/encoding/TestChangingEncoding.java | 2 +-
.../encoding/TestLoadAndSwitchEncodeOnDisk.java | 2 +-
.../mapred/TestTableSnapshotInputFormat.java | 6 +-
.../TableSnapshotInputFormatTestBase.java | 4 +-
.../hbase/mapreduce/TestImportExport.java | 14 +-
.../mapreduce/TestLoadIncrementalHFiles.java | 4 +-
.../TestLoadIncrementalHFilesSplitRecovery.java | 4 +-
.../TestMultiTableSnapshotInputFormat.java | 2 +-
.../mapreduce/TestTableSnapshotInputFormat.java | 6 +-
.../hbase/mapreduce/TestTimeRangeMapRed.java | 2 +-
.../hbase/master/TestAssignmentListener.java | 2 +-
.../master/TestAssignmentManagerMetrics.java | 2 +-
.../master/TestAssignmentManagerOnCluster.java | 12 +-
.../master/TestDistributedLogSplitting.java | 20 +--
.../master/TestGetLastFlushedSequenceId.java | 4 +-
.../apache/hadoop/hbase/master/TestMaster.java | 4 +-
.../TestMasterRestartAfterDisablingTable.java | 4 +-
.../hadoop/hbase/master/TestRollingRestart.java | 4 +-
.../hadoop/hbase/master/TestWarmupRegion.java | 6 +-
.../master/cleaner/TestSnapshotFromMaster.java | 4 +-
.../TestSimpleRegionNormalizerOnCluster.java | 2 +-
.../procedure/TestAddColumnFamilyProcedure.java | 6 +-
.../procedure/TestCloneSnapshotProcedure.java | 4 +-
.../procedure/TestCreateNamespaceProcedure.java | 6 +-
.../TestDeleteColumnFamilyProcedure.java | 6 +-
...stDeleteColumnFamilyProcedureFromClient.java | 4 +-
.../procedure/TestDeleteNamespaceProcedure.java | 6 +-
.../procedure/TestDeleteTableProcedure.java | 6 +-
.../procedure/TestEnableTableProcedure.java | 6 +-
.../TestMasterFailoverWithProcedures.java | 8 +-
.../procedure/TestMasterProcedureEvents.java | 2 +-
.../TestModifyColumnFamilyProcedure.java | 4 +-
.../procedure/TestModifyNamespaceProcedure.java | 12 +-
.../procedure/TestModifyTableProcedure.java | 50 +++----
.../master/procedure/TestProcedureAdmin.java | 4 +-
.../procedure/TestRestoreSnapshotProcedure.java | 14 +-
.../TestSplitTableRegionProcedure.java | 12 +-
.../procedure/TestTableDDLProcedureBase.java | 2 +-
...stTableDescriptorModificationFromClient.java | 16 +--
.../procedure/TestTruncateTableProcedure.java | 8 +-
.../hbase/mob/TestExpiredMobFileCleaner.java | 2 +-
.../hbase/mob/TestMobDataBlockEncoding.java | 2 +-
.../hbase/mob/compactions/TestMobCompactor.java | 2 +-
.../hbase/namespace/TestNamespaceAuditor.java | 2 +-
.../hbase/procedure/TestProcedureManager.java | 2 +-
.../hadoop/hbase/quotas/TestQuotaAdmin.java | 6 +-
.../hadoop/hbase/quotas/TestQuotaThrottle.java | 24 ++--
.../regionserver/TestCompactSplitThread.java | 4 +-
.../hbase/regionserver/TestCompactionState.java | 4 +-
.../hbase/regionserver/TestDeleteMobTable.java | 8 +-
.../regionserver/TestEncryptionKeyRotation.java | 8 +-
.../TestEncryptionRandomKeying.java | 4 +-
.../TestEndToEndSplitTransaction.java | 2 +-
.../hbase/regionserver/TestFSErrorsExposed.java | 2 +-
.../regionserver/TestHRegionServerBulkLoad.java | 2 +-
.../hbase/regionserver/TestJoinedScanners.java | 2 +-
.../hbase/regionserver/TestMobStoreScanner.java | 2 +-
.../regionserver/TestPerColumnFamilyFlush.java | 10 +-
.../TestRegionMergeTransactionOnCluster.java | 19 +--
.../regionserver/TestRegionReplicaFailover.java | 8 +-
.../regionserver/TestRegionServerMetrics.java | 8 +-
.../regionserver/TestRemoveRegionMetrics.java | 2 +-
.../regionserver/TestSCVFWithMiniCluster.java | 2 +-
.../regionserver/TestScannerWithBulkload.java | 6 +-
.../TestSplitTransactionOnCluster.java | 4 +-
.../regionserver/TestSplitWalDataLoss.java | 2 +-
.../hadoop/hbase/regionserver/TestTags.java | 8 +-
.../compactions/TestFIFOCompactionPolicy.java | 12 +-
.../TestCompactionWithThroughputController.java | 10 +-
.../TestFlushWithThroughputController.java | 4 +-
.../wal/AbstractTestLogRolling.java | 2 +-
.../regionserver/wal/AbstractTestWALReplay.java | 2 +-
.../regionserver/wal/TestLogRollAbort.java | 2 +-
.../replication/TestMasterReplication.java | 4 +-
.../replication/TestMultiSlaveReplication.java | 8 +-
...estReplicationChangingPeerRegionservers.java | 2 +-
.../replication/TestReplicationEndpoint.java | 2 +-
.../replication/TestReplicationSmallTests.java | 4 +-
.../replication/TestReplicationSyncUpTool.java | 4 +-
.../replication/TestSerialReplication.java | 20 +--
.../regionserver/TestGlobalThrottler.java | 4 +-
.../TestRegionReplicaReplicationEndpoint.java | 26 ++--
.../hbase/security/access/SecureTestUtil.java | 12 +-
.../security/access/TestAccessController.java | 20 +--
.../hbase/security/access/TestCellACLs.java | 2 +-
.../TestCoprocessorWhitelistMasterObserver.java | 2 +-
.../security/access/TestNamespaceCommands.java | 8 +-
.../access/TestScanEarlyTermination.java | 2 +-
.../security/access/TestTablePermissions.java | 2 +-
.../access/TestWithDisabledAuthorization.java | 2 +-
...sibilityLabelReplicationWithExpAsString.java | 4 +-
.../visibility/TestVisibilityLabels.java | 10 +-
.../TestVisibilityLabelsReplication.java | 4 +-
.../TestVisibilityLabelsWithDeletes.java | 142 +++++++++----------
.../TestVisibilityWithCheckAuths.java | 4 +-
.../hbase/snapshot/MobSnapshotTestingUtils.java | 6 +-
.../hbase/snapshot/SnapshotTestingUtils.java | 4 +-
.../hbase/snapshot/TestExportSnapshot.java | 4 +-
.../TestRestoreFlushSnapshotFromClient.java | 4 +-
.../snapshot/TestSnapshotClientRetries.java | 6 +-
.../hbase/util/TestCoprocessorScanPolicy.java | 6 +-
.../hbase/util/TestHBaseFsckEncryption.java | 4 +-
.../hadoop/hbase/util/TestHBaseFsckOneRS.java | 2 +-
.../util/TestMiniClusterLoadSequential.java | 2 +-
.../hadoop/hbase/util/TestRegionMover.java | 2 +-
.../util/hbck/OfflineMetaRebuildTestCore.java | 12 +-
.../util/hbck/TestOfflineMetaRebuildBase.java | 6 +-
.../thrift2/TestThriftHBaseServiceHandler.java | 2 +-
...TestThriftHBaseServiceHandlerWithLabels.java | 2 +-
206 files changed, 649 insertions(+), 648 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java
----------------------------------------------------------------------
diff --git a/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java b/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java
index 3d9dabd..4d20919 100644
--- a/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java
+++ b/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java
@@ -58,7 +58,7 @@ public class TestHelloHBase {
final String NONEXISTENT_NAMESPACE = "xyzpdq_nonexistent";
final String EXISTING_NAMESPACE = "pdqxyz_myExistingNamespace";
boolean exists;
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
exists = HelloHBase.namespaceExists(admin, NONEXISTENT_NAMESPACE);
assertEquals("#namespaceExists failed: found nonexistent namespace.",
@@ -74,7 +74,7 @@ public class TestHelloHBase {
@Test
public void testCreateNamespaceAndTable() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HelloHBase.createNamespaceAndTable(admin);
boolean namespaceExists
@@ -93,7 +93,7 @@ public class TestHelloHBase {
@Test
public void testPutRowToTable() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createNamespace
(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build());
Table table
@@ -110,7 +110,7 @@ public class TestHelloHBase {
@Test
public void testDeleteRow() throws IOException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createNamespace
(NamespaceDescriptor.create(HelloHBase.MY_NAMESPACE_NAME).build());
Table table
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java
----------------------------------------------------------------------
diff --git a/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java b/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java
index cc5e201..e49fbb5 100644
--- a/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java
+++ b/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java
@@ -58,7 +58,7 @@ public class TestHelloHBase {
final String NONEXISTENT_NAMESPACE = "xyzpdq_nonexistent";
final String EXISTING_NAMESPACE = "pdqxyz_myExistingNamespace";
boolean exists;
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
exists = HelloHBase.namespaceExists(admin, NONEXISTENT_NAMESPACE);
assertEquals("#namespaceExists failed: found nonexistent namespace.",
@@ -74,7 +74,7 @@ public class TestHelloHBase {
@Test
public void testCreateNamespaceAndTable() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
HelloHBase.createNamespaceAndTable(admin);
boolean namespaceExists
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
index c023437..eecf7a3 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestBatchCoprocessorEndpoint.java
@@ -87,7 +87,7 @@ public class TestBatchCoprocessorEndpoint {
conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
ProtobufCoprocessorService.class.getName());
util.startMiniCluster(2);
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
HTableDescriptor desc = new HTableDescriptor(TEST_TABLE);
desc.addFamily(new HColumnDescriptor(TEST_FAMILY));
admin.createTable(desc, new byte[][]{ROWS[rowSeperator1], ROWS[rowSeperator2]});
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
----------------------------------------------------------------------
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
index f5d2a20..0211ab8 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestClassLoading.java
@@ -150,7 +150,7 @@ public class TestClassLoading {
// with configuration values
htd.setValue("COPROCESSOR$2", jarFileOnHDFS2.toString() + "|" + cpName2 +
"|" + Coprocessor.PRIORITY_USER + "|k1=v1,k2=v2,k3=v3");
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
if (admin.isTableEnabled(tableName)) {
admin.disableTable(tableName);
@@ -231,7 +231,7 @@ public class TestClassLoading {
htd.addFamily(new HColumnDescriptor("test"));
htd.setValue("COPROCESSOR$1", getLocalPath(jarFile) + "|" + cpName3 + "|" +
Coprocessor.PRIORITY_USER);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createTable(htd);
waitForTable(htd.getTableName());
@@ -256,7 +256,7 @@ public class TestClassLoading {
htd.addFamily(new HColumnDescriptor("test"));
htd.setValue("COPROCESSOR$1", getLocalPath(jarFile) + "|" + cpName4 + "|" +
Coprocessor.PRIORITY_USER);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createTable(htd);
waitForTable(htd.getTableName());
@@ -317,7 +317,7 @@ public class TestClassLoading {
htd.addCoprocessor(cpName6, new Path(getLocalPath(jarFile6)),
Coprocessor.PRIORITY_USER, kvs);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
if (admin.isTableEnabled(tableName)) {
admin.disableTable(tableName);
@@ -408,7 +408,7 @@ public class TestClassLoading {
// with configuration values
htd.setValue("COPROCESSOR$2", jarFileOnHDFS.toString() + "|" + cpName2 +
"|" + Coprocessor.PRIORITY_USER + "|k1=v1,k2=v2,k3=v3");
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(tableName)) {
if (admin.isTableEnabled(tableName)) {
admin.disableTable(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
index 7e2577a..547b7e9 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorEndpoint.java
@@ -94,7 +94,7 @@ public class TestCoprocessorEndpoint {
conf.setStrings(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
ProtobufCoprocessorService.class.getName());
util.startMiniCluster(2);
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
HTableDescriptor desc = new HTableDescriptor(TEST_TABLE);
desc.addFamily(new HColumnDescriptor(TEST_FAMILY));
admin.createTable(desc, new byte[][]{ROWS[rowSeperator1], ROWS[rowSeperator2]});
@@ -296,7 +296,7 @@ public class TestCoprocessorEndpoint {
@Test
public void testMasterCoprocessorService() throws Throwable {
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
final TestProtos.EchoRequestProto request =
TestProtos.EchoRequestProto.newBuilder().setMessage("hello").build();
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =
@@ -327,7 +327,7 @@ public class TestCoprocessorEndpoint {
@Test
public void testMasterCoprocessorError() throws Throwable {
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
TestRpcServiceProtos.TestProtobufRpcProto.BlockingInterface service =
TestRpcServiceProtos.TestProtobufRpcProto.newBlockingStub(admin.coprocessorService());
try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorTableEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorTableEndpoint.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorTableEndpoint.java
index 4913acf..2f22898 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorTableEndpoint.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestCoprocessorTableEndpoint.java
@@ -126,7 +126,7 @@ public class TestCoprocessorTableEndpoint {
}
private static final void createTable(HTableDescriptor desc) throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.createTable(desc, new byte[][]{ROWS[rowSeperator1], ROWS[rowSeperator2]});
TEST_UTIL.waitUntilAllRegionsAssigned(desc.getTableName());
Table table = TEST_UTIL.getConnection().getTable(desc.getTableName());
@@ -142,7 +142,7 @@ public class TestCoprocessorTableEndpoint {
}
private static void updateTable(HTableDescriptor desc) throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
admin.disableTable(desc.getTableName());
admin.modifyTable(desc.getTableName(), desc);
admin.enableTable(desc.getTableName());
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
index 31646f8..69742a6 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRegionServerCoprocessorEndpoint.java
@@ -77,7 +77,7 @@ public class TestRegionServerCoprocessorEndpoint {
new CoprocessorRpcUtils.BlockingRpcCallback<DummyRegionServerEndpointProtos.DummyResponse>();
DummyRegionServerEndpointProtos.DummyService service =
ProtobufUtil.newServiceStub(DummyRegionServerEndpointProtos.DummyService.class,
- TEST_UTIL.getHBaseAdmin().coprocessorService(serverName));
+ TEST_UTIL.getAdmin().coprocessorService(serverName));
service.dummyCall(controller,
DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance(), rpcCallback);
assertEquals(DUMMY_VALUE, rpcCallback.get().getValue());
@@ -95,7 +95,7 @@ public class TestRegionServerCoprocessorEndpoint {
new CoprocessorRpcUtils.BlockingRpcCallback<DummyRegionServerEndpointProtos.DummyResponse>();
DummyRegionServerEndpointProtos.DummyService service =
ProtobufUtil.newServiceStub(DummyRegionServerEndpointProtos.DummyService.class,
- TEST_UTIL.getHBaseAdmin().coprocessorService(serverName));
+ TEST_UTIL.getAdmin().coprocessorService(serverName));
service.dummyThrow(controller,
DummyRegionServerEndpointProtos.DummyRequest.getDefaultInstance(), rpcCallback);
assertEquals(null, rpcCallback.get());
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java
----------------------------------------------------------------------
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java
index 7bb6e2b..07d2042 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java
@@ -132,8 +132,8 @@ public class TestRowProcessorEndpoint {
public void prepareTestData() throws Exception {
try {
- util.getHBaseAdmin().disableTable(TABLE);
- util.getHBaseAdmin().deleteTable(TABLE);
+ util.getAdmin().disableTable(TABLE);
+ util.getAdmin().deleteTable(TABLE);
} catch (Exception e) {
// ignore table not found
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java
index 5c41fa0..d4bcacd 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java
@@ -151,7 +151,7 @@ public class IntegrationTestIngest extends IntegrationTestBase {
}
private void deleteTableIfNecessary() throws IOException {
- if (util.getHBaseAdmin().tableExists(getTablename())) {
+ if (util.getAdmin().tableExists(getTablename())) {
util.deleteTable(getTablename());
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java
index d531604..1f85a51 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java
@@ -93,7 +93,7 @@ public class IntegrationTestIngestWithEncryption extends IntegrationTestIngest {
// Update the test table schema so HFiles from this point will be written with
// encryption features enabled.
- final Admin admin = util.getHBaseAdmin();
+ final Admin admin = util.getAdmin();
HTableDescriptor tableDescriptor =
new HTableDescriptor(admin.getTableDescriptor(getTablename()));
for (HColumnDescriptor columnDescriptor: tableDescriptor.getColumnFamilies()) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java
index 4c57c88..548ff53 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestLazyCfLoading.java
@@ -198,12 +198,12 @@ public class IntegrationTestLazyCfLoading {
}
int serverCount = util.getHBaseClusterInterface().getClusterStatus().getServersSize();
byte[][] splits = new RegionSplitter.HexStringSplit().split(serverCount * REGIONS_PER_SERVER);
- util.getHBaseAdmin().createTable(htd, splits);
+ util.getAdmin().createTable(htd, splits);
LOG.info("Created table");
}
private void deleteTable() throws Exception {
- if (util.getHBaseAdmin().tableExists(TABLE_NAME)) {
+ if (util.getAdmin().tableExists(TABLE_NAME)) {
LOG.info("Deleting table");
util.deleteTable(TABLE_NAME);
LOG.info("Deleted table");
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java
index fe97e49..88b2e39 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestManyRegions.java
@@ -85,7 +85,7 @@ public class IntegrationTestManyRegions {
UTIL.initializeCluster(REGION_SERVER_COUNT);
LOG.info("Cluster initialized");
- admin = UTIL.getHBaseAdmin();
+ admin = UTIL.getAdmin();
if (admin.tableExists(TABLE_NAME)) {
LOG.info(String.format("Deleting existing table %s.", TABLE_NAME));
if (admin.isTableEnabled(TABLE_NAME)) admin.disableTable(TABLE_NAME);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java
index 8f9b92c..e609f0b 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestRegionReplicaPerf.java
@@ -271,18 +271,18 @@ public class IntegrationTestRegionReplicaPerf extends IntegrationTestBase {
// create/populate the table, replicas disabled
LOG.debug("Populating table.");
- new PerfEvalCallable(util.getHBaseAdmin(), writeOpts).call();
+ new PerfEvalCallable(util.getAdmin(), writeOpts).call();
// one last sanity check, then send in the clowns!
assertEquals("Table must be created with DisabledRegionSplitPolicy. Broken test.",
DisabledRegionSplitPolicy.class.getName(),
- util.getHBaseAdmin().getTableDescriptor(tableName).getRegionSplitPolicyClassName());
+ util.getAdmin().getTableDescriptor(tableName).getRegionSplitPolicyClassName());
startMonkey();
// collect a baseline without region replicas.
for (int i = 0; i < maxIters; i++) {
LOG.debug("Launching non-replica job " + (i + 1) + "/" + maxIters);
- resultsWithoutReplicas.add(new PerfEvalCallable(util.getHBaseAdmin(), readOpts).call());
+ resultsWithoutReplicas.add(new PerfEvalCallable(util.getAdmin(), readOpts).call());
// TODO: sleep to let cluster stabilize, though monkey continues. is it necessary?
Thread.sleep(5000l);
}
@@ -290,14 +290,14 @@ public class IntegrationTestRegionReplicaPerf extends IntegrationTestBase {
// disable monkey, enable region replicas, enable monkey
cleanUpMonkey("Altering table.");
LOG.debug("Altering " + tableName + " replica count to " + replicaCount);
- IntegrationTestingUtility.setReplicas(util.getHBaseAdmin(), tableName, replicaCount);
+ IntegrationTestingUtility.setReplicas(util.getAdmin(), tableName, replicaCount);
setUpMonkey();
startMonkey();
// run test with region replicas.
for (int i = 0; i < maxIters; i++) {
LOG.debug("Launching replica job " + (i + 1) + "/" + maxIters);
- resultsWithReplicas.add(new PerfEvalCallable(util.getHBaseAdmin(), replicaReadOpts).call());
+ resultsWithReplicas.add(new PerfEvalCallable(util.getAdmin(), replicaReadOpts).call());
// TODO: sleep to let cluster stabilize, though monkey continues. is it necessary?
Thread.sleep(5000l);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
index fcda1b0..8038758 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestingUtility.java
@@ -138,7 +138,7 @@ public class IntegrationTestingUtility extends HBaseTestingUtility {
ClusterManager clusterManager = ReflectionUtils.newInstance(
clusterManagerClass, conf);
setHBaseCluster(new DistributedHBaseCluster(conf, clusterManager));
- getHBaseAdmin();
+ getAdmin();
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java
index a6b502f..073de77 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/StripeCompactionsPerformanceEvaluation.java
@@ -172,12 +172,12 @@ public class StripeCompactionsPerformanceEvaluation extends AbstractHBaseTool {
}
protected void deleteTable() throws Exception {
- if (util.getHBaseAdmin().tableExists(TABLE_NAME)) {
+ if (util.getAdmin().tableExists(TABLE_NAME)) {
LOG.info("Deleting table");
- if (!util.getHBaseAdmin().isTableDisabled(TABLE_NAME)) {
- util.getHBaseAdmin().disableTable(TABLE_NAME);
+ if (!util.getAdmin().isTableDisabled(TABLE_NAME)) {
+ util.getAdmin().disableTable(TABLE_NAME);
}
- util.getHBaseAdmin().deleteTable(TABLE_NAME);
+ util.getAdmin().deleteTable(TABLE_NAME);
LOG.info("Deleted table");
}
}
@@ -297,7 +297,7 @@ public class StripeCompactionsPerformanceEvaluation extends AbstractHBaseTool {
}
byte[][] splits = new RegionSplitter.HexStringSplit().split(
util.getHBaseClusterInterface().getClusterStatus().getServersSize());
- util.getHBaseAdmin().createTable(htd, splits);
+ util.getAdmin().createTable(htd, splits);
}
public static class SeqShardedDataGenerator extends LoadTestDataGenerator {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java
index fe140e2..d1a32b1 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java
@@ -208,7 +208,7 @@ public class Action {
LOG.info("Moving " + victimRegions.size() + " regions from " + fromServers.size()
+ " servers to " + toServers.size() + " different servers");
- Admin admin = this.context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ Admin admin = this.context.getHBaseIntegrationTestingUtility().getAdmin();
for (byte[] victimRegion : victimRegions) {
// Don't keep moving regions if we're
// trying to stop the monkey.
@@ -221,7 +221,7 @@ public class Action {
}
protected void forceBalancer() throws Exception {
- Admin admin = this.context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ Admin admin = this.context.getHBaseIntegrationTestingUtility().getAdmin();
boolean result = false;
try {
result = admin.balancer();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java
index 27268a4..f382747 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/AddColumnAction.java
@@ -40,7 +40,7 @@ public class AddColumnAction extends Action {
@Override
public void init(ActionContext context) throws IOException {
super.init(context);
- this.admin = context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ this.admin = context.getHBaseIntegrationTestingUtility().getAdmin();
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.java
index 684cd62..576b220 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeBloomFilterAction.java
@@ -48,7 +48,7 @@ public class ChangeBloomFilterAction extends Action {
public void perform() throws Exception {
Random random = new Random();
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
LOG.info("Performing action: Change bloom filter on all columns of table "
+ tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeCompressionAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeCompressionAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeCompressionAction.java
index 9c7bf45..df7d5bb 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeCompressionAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeCompressionAction.java
@@ -45,7 +45,7 @@ public class ChangeCompressionAction extends Action {
@Override
public void init(ActionContext context) throws IOException {
super.init(context);
- this.admin = context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ this.admin = context.getHBaseIntegrationTestingUtility().getAdmin();
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeEncodingAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeEncodingAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeEncodingAction.java
index c4553f1..1fbf93a 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeEncodingAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeEncodingAction.java
@@ -44,7 +44,7 @@ public class ChangeEncodingAction extends Action {
@Override
public void init(ActionContext context) throws IOException {
super.init(context);
- this.admin = context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ this.admin = context.getHBaseIntegrationTestingUtility().getAdmin();
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java
index b5f759f..9af5728 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeSplitPolicyAction.java
@@ -46,7 +46,7 @@ public class ChangeSplitPolicyAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
LOG.info("Performing action: Change split policy of table " + tableName);
HTableDescriptor tableDescriptor = admin.getTableDescriptor(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeVersionsAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeVersionsAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeVersionsAction.java
index 76e152f..a393b4a 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeVersionsAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/ChangeVersionsAction.java
@@ -45,7 +45,7 @@ public class ChangeVersionsAction extends Action {
@Override
public void init(ActionContext context) throws IOException {
super.init(context);
- this.admin = context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ this.admin = context.getHBaseIntegrationTestingUtility().getAdmin();
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java
index b75bbbd..bbb86a1 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactMobAction.java
@@ -46,7 +46,7 @@ public class CompactMobAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
boolean major = RandomUtils.nextInt(100) < majorRatio;
// Don't try the modify if we're stopping
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java
index 114b511..046415f 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactRandomRegionOfTableAction.java
@@ -50,7 +50,7 @@ public class CompactRandomRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
boolean major = RandomUtils.nextInt(100) < majorRatio;
LOG.info("Performing action: Compact random region of table "
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java
index 796cc43..3eab335 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/CompactTableAction.java
@@ -45,7 +45,7 @@ public class CompactTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
boolean major = RandomUtils.nextInt(100) < majorRatio;
LOG.info("Performing action: Compact table " + tableName + ", major=" + major);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/DecreaseMaxHFileSizeAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/DecreaseMaxHFileSizeAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/DecreaseMaxHFileSizeAction.java
index eaada16..98babeb 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/DecreaseMaxHFileSizeAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/DecreaseMaxHFileSizeAction.java
@@ -43,7 +43,7 @@ public class DecreaseMaxHFileSizeAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
HTableDescriptor htd = admin.getTableDescriptor(tableName);
// Try and get the current value.
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushRandomRegionOfTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushRandomRegionOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushRandomRegionOfTableAction.java
index c919789..c5a1156 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushRandomRegionOfTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushRandomRegionOfTableAction.java
@@ -45,7 +45,7 @@ public class FlushRandomRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
LOG.info("Performing action: Flush random region of table " + tableName);
List<HRegionInfo> regions = admin.getTableRegions(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushTableAction.java
index ddce57e..50fffea 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/FlushTableAction.java
@@ -41,7 +41,7 @@ public class FlushTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
// Don't try the flush if we're stopping
if (context.isStopping()) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java
index 03d310e..aa796ab 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MergeRandomAdjacentRegionsOfTableAction.java
@@ -45,7 +45,7 @@ public class MergeRandomAdjacentRegionsOfTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
LOG.info("Performing action: Merge random adjacent regions of table " + tableName);
List<HRegionInfo> regions = admin.getTableRegions(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java
index 96cd008..bb8f244 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRandomRegionOfTableAction.java
@@ -49,7 +49,7 @@ public class MoveRandomRegionOfTableAction extends Action {
}
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
LOG.info("Performing action: Move random region of table " + tableName);
List<HRegionInfo> regions = admin.getTableRegions(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java
index d5f0e96..146c63c 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/MoveRegionsOfTableAction.java
@@ -54,7 +54,7 @@ public class MoveRegionsOfTableAction extends Action {
Thread.sleep(sleepTime);
}
- Admin admin = this.context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ Admin admin = this.context.getHBaseIntegrationTestingUtility().getAdmin();
Collection<ServerName> serversList = admin.getClusterStatus().getServers();
ServerName[] servers = serversList.toArray(new ServerName[serversList.size()]);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
index 20bdaa3..b878d20 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RemoveColumnAction.java
@@ -46,7 +46,7 @@ public class RemoveColumnAction extends Action {
@Override
public void init(ActionContext context) throws IOException {
super.init(context);
- this.admin = context.getHBaseIntegrationTestingUtility().getHBaseAdmin();
+ this.admin = context.getHBaseIntegrationTestingUtility().getAdmin();
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SnapshotTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SnapshotTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SnapshotTableAction.java
index 15b8e86..4bd9d1d 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SnapshotTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SnapshotTableAction.java
@@ -42,7 +42,7 @@ public class SnapshotTableAction extends Action {
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
String snapshotName = tableName + "-it-" + System.currentTimeMillis();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
// Don't try the snapshot if we're stopping
if (context.isStopping()) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitAllRegionOfTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitAllRegionOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitAllRegionOfTableAction.java
index 5b29d00..a924f40 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitAllRegionOfTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitAllRegionOfTableAction.java
@@ -46,7 +46,7 @@ public class SplitAllRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
// Don't try the split if we're stopping
if (context.isStopping()) {
return;
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitRandomRegionOfTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitRandomRegionOfTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitRandomRegionOfTableAction.java
index 25c80e9..de266f5 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitRandomRegionOfTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SplitRandomRegionOfTableAction.java
@@ -45,7 +45,7 @@ public class SplitRandomRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
LOG.info("Performing action: Split random region of table " + tableName);
List<HRegionInfo> regions = admin.getTableRegions(tableName);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TruncateTableAction.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TruncateTableAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TruncateTableAction.java
index 87f91dd..4903a07 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TruncateTableAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/TruncateTableAction.java
@@ -39,7 +39,7 @@ public class TruncateTableAction extends Action {
@Override
public void perform() throws Exception {
HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
// Don't try the truncate if we're stopping
if (context.isStopping()) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
index 4e85425..e518269 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestBulkLoad.java
@@ -201,7 +201,7 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
if (replicaCount == NUM_REPLICA_COUNT_DEFAULT) return;
TableName t = getTablename();
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
HTableDescriptor desc = admin.getTableDescriptor(t);
desc.addCoprocessor(SlowMeCoproScanOperations.class.getName());
HBaseTestingUtility.modifyTableSync(admin, desc);
@@ -231,7 +231,7 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
}
private void setupTable() throws IOException, InterruptedException {
- if (util.getHBaseAdmin().tableExists(getTablename())) {
+ if (util.getAdmin().tableExists(getTablename())) {
util.deleteTable(getTablename());
}
@@ -245,7 +245,7 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
if (replicaCount == NUM_REPLICA_COUNT_DEFAULT) return;
TableName t = getTablename();
- HBaseTestingUtility.setReplicas(util.getHBaseAdmin(), t, replicaCount);
+ HBaseTestingUtility.setReplicas(util.getAdmin(), t, replicaCount);
}
private void runLinkedListMRJob(int iteration) throws Exception {
@@ -746,7 +746,7 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
// Scale this up on a real cluster
if (util.isDistributedCluster()) {
util.getConfiguration().setIfUnset(NUM_MAPS_KEY,
- Integer.toString(util.getHBaseAdmin().getClusterStatus().getServersSize() * 10)
+ Integer.toString(util.getAdmin().getClusterStatus().getServersSize() * 10)
);
util.getConfiguration().setIfUnset(NUM_IMPORT_ROUNDS_KEY, "5");
} else {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
index 437f200..f87cc86 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mttr/IntegrationTestMTTR.java
@@ -223,11 +223,11 @@ public class IntegrationTestMTTR {
loadTableName = TableName.valueOf(util.getConfiguration()
.get("hbase.IntegrationTestMTTR.loadTableName", "IntegrationTestMTTRLoadTestTool"));
- if (util.getHBaseAdmin().tableExists(tableName)) {
+ if (util.getAdmin().tableExists(tableName)) {
util.deleteTable(tableName);
}
- if (util.getHBaseAdmin().tableExists(loadTableName)) {
+ if (util.getAdmin().tableExists(loadTableName)) {
util.deleteTable(loadTableName);
}
@@ -240,7 +240,7 @@ public class IntegrationTestMTTR {
HColumnDescriptor descriptor = new HColumnDescriptor(FAMILY);
descriptor.setMaxVersions(1);
tableDescriptor.addFamily(descriptor);
- util.getHBaseAdmin().createTable(tableDescriptor);
+ util.getAdmin().createTable(tableDescriptor);
// Setup the table for LoadTestTool
int ret = loadTool.run(new String[]{"-tn", loadTableName.getNameAsString(), "-init_only"});
@@ -557,7 +557,7 @@ public class IntegrationTestMTTR {
protected boolean doAction() throws Exception {
Admin admin = null;
try {
- admin = util.getHBaseAdmin();
+ admin = util.getAdmin();
ClusterStatus status = admin.getClusterStatus();
return status != null;
} finally {
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
index fe9c58c2..f72b5f7 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/rsgroup/IntegrationTestRSGroup.java
@@ -47,7 +47,7 @@ public class IntegrationTestRSGroup extends TestRSGroupsBase {
TEST_UTIL = new IntegrationTestingUtility();
((IntegrationTestingUtility)TEST_UTIL).initializeCluster(NUM_SLAVES_BASE);
//set shared configs
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
cluster = TEST_UTIL.getHBaseClusterInterface();
rsGroupAdmin = new VerifyingRSGroupAdminClient(rsGroupAdmin.newClient(TEST_UTIL.getConnection()),
TEST_UTIL.getConfiguration());
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
index 5b437d4..dec565f 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadAndVerify.java
@@ -538,7 +538,7 @@ public void cleanUpCluster() throws Exception {
HTableDescriptor htd = new HTableDescriptor(TableName.valueOf(TEST_NAME));
htd.addFamily(new HColumnDescriptor(TEST_FAMILY));
- Admin admin = getTestingUtil(getConf()).getHBaseAdmin();
+ Admin admin = getTestingUtil(getConf()).getAdmin();
admin.createTable(htd, Bytes.toBytes(0L), Bytes.toBytes(-1L), 40);
doLoad(getConf(), htd);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java
index d6bed79..e92f863 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestTimeBoundedRequestsWithRegionReplicas.java
@@ -159,7 +159,7 @@ public class IntegrationTestTimeBoundedRequestsWithRegionReplicas extends Integr
// flush the table
LOG.info("Flushing the table");
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
admin.flush(getTablename());
// re-open the regions to make sure that the replicas are up to date
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
----------------------------------------------------------------------
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
index f325aac..b7463bd 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/trace/IntegrationTestSendTraceRequests.java
@@ -94,7 +94,7 @@ public class IntegrationTestSendTraceRequests extends AbstractHBaseTool {
@Test
public void internalDoWork() throws Exception {
util = createUtil();
- admin = util.getHBaseAdmin();
+ admin = util.getAdmin();
setupReceiver();
deleteTable();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
index 61e650b..fc8290f 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/RowResourceBase.java
@@ -107,7 +107,7 @@ public class RowResourceBase {
@Before
public void beforeMethod() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE_NAME)) {
TEST_UTIL.deleteTable(TABLE_NAME);
}
@@ -119,7 +119,7 @@ public class RowResourceBase {
@After
public void afterMethod() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE_NAME)) {
TEST_UTIL.deleteTable(TABLE_NAME);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
index 5097454..1d245b3 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestGzipFilter.java
@@ -68,7 +68,7 @@ public class TestGzipFilter {
REST_TEST_UTIL.startServletContainer(TEST_UTIL.getConfiguration());
client = new Client(new Cluster().add("localhost",
REST_TEST_UTIL.getServletPort()));
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE)) {
return;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
index c1087b5..dfcc8af 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestMultiRowResource.java
@@ -107,7 +107,7 @@ public class TestMultiRowResource {
marshaller = context.createMarshaller();
unmarshaller = context.createUnmarshaller();
client = new Client(new Cluster().add("localhost", REST_TEST_UTIL.getServletPort()));
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE)) {
return;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java
index d7649b0..7f75a22 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesInstanceResource.java
@@ -152,7 +152,7 @@ public class TestNamespacesInstanceResource {
Response response;
// Check that doesn't exist via non-REST call.
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertNotNull(findNamespace(admin, "default"));
assertNotNull(findNamespace(admin, "hbase"));
@@ -168,7 +168,7 @@ public class TestNamespacesInstanceResource {
@Test
public void testGetNamespaceTablesAndCannotDeleteNamespace() throws IOException, JAXBException {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
String nsName = "TestNamespacesInstanceResource5";
Response response;
@@ -251,7 +251,7 @@ public class TestNamespacesInstanceResource {
Response response;
// Check that namespaces don't exist via non-REST call.
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertNull(findNamespace(admin, NAMESPACE1));
assertNull(findNamespace(admin, NAMESPACE2));
assertNull(findNamespace(admin, NAMESPACE3));
@@ -289,7 +289,7 @@ public class TestNamespacesInstanceResource {
Response response;
// Check that namespaces don't exist via non-REST call.
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertNull(findNamespace(admin, NAMESPACE1));
assertNull(findNamespace(admin, NAMESPACE2));
@@ -365,7 +365,7 @@ public class TestNamespacesInstanceResource {
Response response;
// Check that namespaces don't exist via non-REST call.
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertNull(findNamespace(admin, NAMESPACE3));
assertNull(findNamespace(admin, NAMESPACE4));
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesResource.java
index bbd6f32..e3d82a3 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestNamespacesResource.java
@@ -101,7 +101,7 @@ public class TestNamespacesResource {
Response response;
// Check that namespace does not yet exist via non-REST call.
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertFalse(doesNamespaceExist(admin, NAMESPACE1));
model = testNamespacesModel.buildTestModel();
testNamespacesModel.checkModel(model);
@@ -159,7 +159,7 @@ public class TestNamespacesResource {
Response response;
// Check that namespace does not yet exist via non-REST call.
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertFalse(doesNamespaceExist(admin, NAMESPACE1));
model = testNamespacesModel.buildTestModel();
testNamespacesModel.checkModel(model);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
index be7ee9a..3916386 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannerResource.java
@@ -175,7 +175,7 @@ public class TestScannerResource {
ScannerModel.class);
marshaller = context.createMarshaller();
unmarshaller = context.createUnmarshaller();
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE)) {
return;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
index bedd08e..083ddbe 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithFilters.java
@@ -137,7 +137,7 @@ public class TestScannersWithFilters {
unmarshaller = context.createUnmarshaller();
client = new Client(new Cluster().add("localhost",
REST_TEST_UTIL.getServletPort()));
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (!admin.tableExists(TABLE)) {
HTableDescriptor htd = new HTableDescriptor(TABLE);
htd.addFamily(new HColumnDescriptor(FAMILIES[0]));
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java
index 8b0b5b2..1a86ce9 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestScannersWithLabels.java
@@ -145,7 +145,7 @@ public class TestScannersWithLabels {
ScannerModel.class);
marshaller = context.createMarshaller();
unmarshaller = context.createUnmarshaller();
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE)) {
return;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
index 96106e9..df920b1 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSchemaResource.java
@@ -122,7 +122,7 @@ public class TestSchemaResource {
TableSchemaModel model;
Response response;
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertFalse(admin.tableExists(TableName.valueOf(TABLE1)));
// create the table
@@ -181,7 +181,7 @@ public class TestSchemaResource {
TableSchemaModel model;
Response response;
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
assertFalse(admin.tableExists(TableName.valueOf(TABLE2)));
// create the table
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
index 1666bc9..8264680 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableResource.java
@@ -91,7 +91,7 @@ public class TestTableResource {
TableInfoModel.class,
TableListModel.class,
TableRegionModel.class);
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE)) {
return;
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java
index 7924aed..32f508a 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestTableScan.java
@@ -99,7 +99,7 @@ public class TestTableScan {
REST_TEST_UTIL.startServletContainer(conf);
client = new Client(new Cluster().add("localhost",
REST_TEST_UTIL.getServletPort()));
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (!admin.tableExists(TABLE)) {
HTableDescriptor htd = new HTableDescriptor(TABLE);
htd.addFamily(new HColumnDescriptor(CFA));
@@ -112,8 +112,8 @@ public class TestTableScan {
@AfterClass
public static void tearDownAfterClass() throws Exception {
- TEST_UTIL.getHBaseAdmin().disableTable(TABLE);
- TEST_UTIL.getHBaseAdmin().deleteTable(TABLE);
+ TEST_UTIL.getAdmin().disableTable(TABLE);
+ TEST_UTIL.getAdmin().deleteTable(TABLE);
REST_TEST_UTIL.shutdownServletContainer();
TEST_UTIL.shutdownMiniCluster();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
----------------------------------------------------------------------
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
index 57f20fd..0310d9f 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
@@ -108,7 +108,7 @@ public class TestRemoteTable {
@Before
public void before() throws Exception {
- Admin admin = TEST_UTIL.getHBaseAdmin();
+ Admin admin = TEST_UTIL.getAdmin();
if (admin.tableExists(TABLE)) {
if (admin.isTableEnabled(TABLE)) admin.disableTable(TABLE);
admin.deleteTable(TABLE);
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
----------------------------------------------------------------------
diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
index 51a676f..957994f 100644
--- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
+++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroups.java
@@ -80,7 +80,7 @@ public class TestRSGroups extends TestRSGroupsBase {
ServerManager.WAIT_ON_REGIONSERVERS_MINTOSTART,
""+NUM_SLAVES_BASE);
- admin = TEST_UTIL.getHBaseAdmin();
+ admin = TEST_UTIL.getAdmin();
cluster = TEST_UTIL.getHBaseCluster();
master = ((MiniHBaseCluster)cluster).getMaster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java
----------------------------------------------------------------------
diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java
index 50302bc..15e5099 100644
--- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java
+++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsBase.java
@@ -35,8 +35,8 @@ import org.apache.hadoop.hbase.RegionLoad;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter;
+import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ClusterConnection;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.constraint.ConstraintException;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.generated.AdminProtos;
@@ -68,7 +68,7 @@ public abstract class TestRSGroupsBase {
//shared, cluster type specific
protected static HBaseTestingUtility TEST_UTIL;
- protected static HBaseAdmin admin;
+ protected static Admin admin;
protected static HBaseCluster cluster;
protected static RSGroupAdmin rsGroupAdmin;
@@ -106,13 +106,13 @@ public abstract class TestRSGroupsBase {
}
protected void deleteTableIfNecessary() throws IOException {
- for (HTableDescriptor desc : TEST_UTIL.getHBaseAdmin().listTables(tablePrefix+".*")) {
+ for (HTableDescriptor desc : TEST_UTIL.getAdmin().listTables(tablePrefix+".*")) {
TEST_UTIL.deleteTable(desc.getTableName());
}
}
protected void deleteNamespaceIfNecessary() throws IOException {
- for (NamespaceDescriptor desc : TEST_UTIL.getHBaseAdmin().listNamespaceDescriptors()) {
+ for (NamespaceDescriptor desc : TEST_UTIL.getAdmin().listNamespaceDescriptors()) {
if(desc.getName().startsWith(tablePrefix)) {
admin.deleteNamespace(desc.getName());
}
@@ -496,7 +496,7 @@ public abstract class TestRSGroupsBase {
});
// Lets move this region to the new group.
- TEST_UTIL.getHBaseAdmin().move(Bytes.toBytes(HRegionInfo.encodeRegionName(Bytes.toBytes(targetRegion))),
+ TEST_UTIL.getAdmin().move(Bytes.toBytes(HRegionInfo.encodeRegionName(Bytes.toBytes(targetRegion))),
Bytes.toBytes(targetServer.getServerName()));
TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsOfflineMode.java
----------------------------------------------------------------------
diff --git a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsOfflineMode.java b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsOfflineMode.java
index b89ea0e..ace9594 100644
--- a/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsOfflineMode.java
+++ b/hbase-rsgroup/src/test/java/org/apache/hadoop/hbase/rsgroup/TestRSGroupsOfflineMode.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.hbase.HRegionInfo;
import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
+import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.ServerManager;
@@ -54,7 +54,7 @@ public class TestRSGroupsOfflineMode {
private static final org.apache.commons.logging.Log LOG =
LogFactory.getLog(TestRSGroupsOfflineMode.class);
private static HMaster master;
- private static HBaseAdmin hbaseAdmin;
+ private static Admin hbaseAdmin;
private static HBaseTestingUtility TEST_UTIL;
private static HBaseCluster cluster;
private static RSGroupAdminEndpoint RSGroupAdminEndpoint;
@@ -75,7 +75,7 @@ public class TestRSGroupsOfflineMode {
cluster = TEST_UTIL.getHBaseCluster();
master = ((MiniHBaseCluster)cluster).getMaster();
master.balanceSwitch(false);
- hbaseAdmin = TEST_UTIL.getHBaseAdmin();
+ hbaseAdmin = TEST_UTIL.getAdmin();
//wait till the balancer is in online mode
TEST_UTIL.waitFor(WAIT_TIMEOUT, new Waiter.Predicate<Exception>() {
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/aff8de83/hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
index 47c306b..59ca64c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
@@ -84,12 +84,12 @@ public class TestAcidGuarantees implements Tool {
}
if (useMob) {
- HTableDescriptor htd = util.getHBaseAdmin().getTableDescriptor(TABLE_NAME);
+ HTableDescriptor htd = util.getAdmin().getTableDescriptor(TABLE_NAME);
HColumnDescriptor hcd = htd.getColumnFamilies()[0];
// force mob enabled such that all data is mob data
hcd.setMobEnabled(true);
hcd.setMobThreshold(4);
- util.getHBaseAdmin().modifyColumnFamily(TABLE_NAME, hcd);
+ util.getAdmin().modifyColumnFamily(TABLE_NAME, hcd);
}
}
@@ -337,7 +337,7 @@ public class TestAcidGuarantees implements Tool {
}
// Add a flusher
ctx.addThread(new RepeatingTestThread(ctx) {
- Admin admin = util.getHBaseAdmin();
+ Admin admin = util.getAdmin();
public void doAnAction() throws Exception {
try {
admin.flush(TABLE_NAME);