You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2021/07/19 01:29:40 UTC
[hbase] branch master updated: HBASE-26081 Copy HBTU to
hbase-testing-util,
rename the HBTU related classes in hbase-server and mark them as
IA.LimitedPrivate (#3478)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new d30cc27 HBASE-26081 Copy HBTU to hbase-testing-util, rename the HBTU related classes in hbase-server and mark them as IA.LimitedPrivate (#3478)
d30cc27 is described below
commit d30cc270979dd2ec7d5e0ed12466f0cbd6797bba
Author: Duo Zhang <zh...@apache.org>
AuthorDate: Mon Jul 19 09:29:08 2021 +0800
HBASE-26081 Copy HBTU to hbase-testing-util, rename the HBTU related classes in hbase-server and mark them as IA.LimitedPrivate (#3478)
Signed-off-by: Michael Stack <st...@apache.org>
---
.../exemplars/client/TestHelloHBase.java | 6 +-
.../exemplars/shaded_client/TestHelloHBase.java | 6 +-
.../hadoop/hbase/io/asyncfs/AsyncFSTestBase.java | 6 +-
.../hbase/io/asyncfs/TestLocalAsyncOutput.java | 4 +-
.../hadoop/hbase/security/HBaseKerberosUtils.java | 4 +-
.../hadoop/hbase/util/TestRecoverLeaseFSUtils.java | 4 +-
.../apache/hadoop/hbase/backup/TestBackupBase.java | 10 +-
.../hbase/backup/TestBackupDeleteWithFailures.java | 4 +-
.../hbase/backup/TestBackupHFileCleaner.java | 4 +-
.../hadoop/hbase/backup/TestBackupManager.java | 8 +-
.../hadoop/hbase/backup/TestBackupSystemTable.java | 8 +-
.../hadoop/hbase/backup/TestBackupUtils.java | 4 +-
.../hadoop/hbase/backup/TestIncrementalBackup.java | 18 +-
.../hadoop/hbase/backup/TestRemoteBackup.java | 4 +-
.../hadoop/hbase/backup/TestRemoteRestore.java | 4 +-
.../LoadBalancerPerformanceEvaluation.java | 5 +-
...estStochasticLoadBalancerHeterogeneousCost.java | 4 +-
...ochasticLoadBalancerHeterogeneousCostRules.java | 4 +-
.../client/TestMasterRegistryHedgedReads.java | 4 +-
.../hadoop/hbase/filter/TestKeyOnlyFilter.java | 4 +-
...ingUtility.java => HBaseCommonTestingUtil.java} | 40 +--
.../org/apache/hadoop/hbase/TestClassFinder.java | 2 +-
.../hadoop/hbase/TestHBaseConfiguration.java | 2 +-
.../hbase/io/crypto/TestKeyStoreKeyProvider.java | 4 +-
.../hadoop/hbase/util/TestByteBufferUtils.java | 4 +-
.../hadoop/hbase/util/TestCommonFSUtils.java | 6 +-
.../hbase/util/TestCoprocessorClassLoader.java | 4 +-
.../hadoop/hbase/util/TestDynamicClassLoader.java | 4 +-
.../hadoop/hbase/util/TestSimpleKdcServerUtil.java | 6 +-
.../hbase/client/TestAsyncAggregationClient.java | 4 +-
.../hbase/client/TestRpcControllerFactory.java | 6 +-
.../coprocessor/TestBatchCoprocessorEndpoint.java | 4 +-
.../hadoop/hbase/coprocessor/TestClassLoading.java | 16 +-
.../hbase/coprocessor/TestCoprocessorEndpoint.java | 4 +-
.../coprocessor/TestCoprocessorTableEndpoint.java | 4 +-
.../TestRegionServerCoprocessorEndpoint.java | 6 +-
.../hadoop/hbase/coprocessor/TestSecureExport.java | 4 +-
.../regionserver/TestServerCustomProtocol.java | 4 +-
.../client/example/TestAsyncClientExample.java | 4 +-
.../hbase/client/example/TestHttpProxyExample.java | 4 +-
.../coprocessor/example/TestRefreshHFilesBase.java | 8 +-
.../example/TestScanModifyingObserver.java | 4 +-
.../example/TestValueReplacingCompaction.java | 4 +-
.../example/TestZooKeeperScanPolicyObserver.java | 4 +-
.../WriteHeavyIncrementObserverTestBase.java | 5 +-
.../hbase/mapreduce/TestMapReduceExamples.java | 4 +-
.../TestShadeSaslAuthenticationProvider.java | 6 +-
.../hbase/http/TestProxyUserSpnegoHttpServer.java | 6 +-
.../hadoop/hbase/http/TestSSLHttpServer.java | 6 +-
.../hadoop/hbase/http/TestSpnegoHttpServer.java | 6 +-
.../apache/hadoop/hbase/http/log/TestLogLevel.java | 6 +-
.../hadoop/hbase/http/ssl/KeyStoreTestUtil.java | 6 +-
.../hadoop/hbase/DistributedHBaseCluster.java | 11 +-
.../hadoop/hbase/IntegrationTestBackupRestore.java | 2 +-
.../hbase/IntegrationTestDDLMasterFailover.java | 2 +-
.../apache/hadoop/hbase/IntegrationTestIngest.java | 2 +-
.../IntegrationTestIngestStripeCompactions.java | 2 +-
.../hadoop/hbase/IntegrationTestMetaReplicas.java | 2 +-
.../hadoop/hbase/IntegrationTestingUtility.java | 6 +-
.../StripeCompactionsPerformanceEvaluation.java | 2 +-
.../hadoop/hbase/TestRESTApiClusterManager.java | 4 +-
.../hbase/TestShellExecEndpointCoprocessor.java | 4 +-
.../apache/hadoop/hbase/chaos/actions/Action.java | 16 +-
.../chaos/actions/ChangeSplitPolicyAction.java | 4 +-
.../hbase/chaos/actions/CompactMobAction.java | 4 +-
.../actions/CompactRandomRegionOfTableAction.java | 4 +-
.../hbase/chaos/actions/CompactTableAction.java | 4 +-
.../actions/FlushRandomRegionOfTableAction.java | 4 +-
.../hbase/chaos/actions/FlushTableAction.java | 4 +-
.../MergeRandomAdjacentRegionsOfTableAction.java | 4 +-
.../actions/MoveRandomRegionOfTableAction.java | 4 +-
.../hbase/chaos/actions/SnapshotTableAction.java | 4 +-
.../chaos/actions/SplitAllRegionOfTableAction.java | 4 +-
.../actions/SplitRandomRegionOfTableAction.java | 4 +-
.../hbase/chaos/actions/SudoCommandAction.java | 4 +-
.../hbase/chaos/actions/TruncateTableAction.java | 4 +-
.../hbase/mapreduce/IntegrationTestBulkLoad.java | 6 +-
.../hbase/test/IntegrationTestBigLinkedList.java | 14 +-
.../hbase/test/IntegrationTestLoadCommonCrawl.java | 10 +-
.../hadoop/hbase/TestPerformanceEvaluation.java | 2 +-
.../hadoop/hbase/mapred/TestTableInputFormat.java | 4 +-
.../hbase/mapred/TestTableMapReduceUtil.java | 4 +-
.../TestTableOutputFormatConnectionExhaust.java | 4 +-
.../hbase/mapred/TestTableSnapshotInputFormat.java | 16 +-
.../mapreduce/MultiTableInputFormatTestBase.java | 4 +-
.../TableSnapshotInputFormatTestBase.java | 16 +-
.../hadoop/hbase/mapreduce/TestCellCounter.java | 4 +-
.../hadoop/hbase/mapreduce/TestCopyTable.java | 4 +-
.../hbase/mapreduce/TestHBaseMRTestingUtility.java | 4 +-
.../hbase/mapreduce/TestHFileOutputFormat2.java | 22 +-
.../hbase/mapreduce/TestHRegionPartitioner.java | 4 +-
.../hadoop/hbase/mapreduce/TestHashTable.java | 4 +-
.../hadoop/hbase/mapreduce/TestImportExport.java | 4 +-
.../TestImportTSVWithOperationAttributes.java | 6 +-
.../hbase/mapreduce/TestImportTSVWithTTLs.java | 6 +-
.../TestImportTSVWithVisibilityLabels.java | 8 +-
.../hadoop/hbase/mapreduce/TestImportTsv.java | 8 +-
.../mapreduce/TestMultithreadedTableMapper.java | 6 +-
.../hadoop/hbase/mapreduce/TestRowCounter.java | 4 +-
.../mapreduce/TestSimpleTotalOrderPartitioner.java | 4 +-
.../hadoop/hbase/mapreduce/TestSyncTable.java | 4 +-
.../hbase/mapreduce/TestTableInputFormat.java | 4 +-
.../mapreduce/TestTableInputFormatScanBase.java | 4 +-
.../hbase/mapreduce/TestTableMapReduceBase.java | 4 +-
.../hbase/mapreduce/TestTableRecordReader.java | 4 +-
.../mapreduce/TestTableSnapshotInputFormat.java | 14 +-
.../hbase/mapreduce/TestTimeRangeMapRed.java | 6 +-
.../hadoop/hbase/mapreduce/TestWALPlayer.java | 8 +-
.../hbase/mapreduce/TestWALRecordReader.java | 4 +-
.../hbase/regionserver/TestCompactionTool.java | 12 +-
.../hbase/replication/TestVerifyReplication.java | 8 +-
.../replication/TestVerifyReplicationAdjunct.java | 4 +-
.../TestVerifyReplicationCrossDiffHdfs.java | 12 +-
.../hadoop/hbase/snapshot/TestExportSnapshot.java | 6 +-
.../hbase/snapshot/TestExportSnapshotAdjunct.java | 4 +-
.../snapshot/TestExportSnapshotV1NoCluster.java | 10 +-
.../snapshot/TestExportSnapshotV2NoCluster.java | 4 +-
.../org/apache/hadoop/hbase/util/LoadTestTool.java | 4 +-
.../hbase/procedure2/TestChildProcedures.java | 6 +-
.../hbase/procedure2/TestForceUpdateProcedure.java | 4 +-
.../hbase/procedure2/TestProcedureBypass.java | 6 +-
.../hbase/procedure2/TestProcedureCleanup.java | 6 +-
.../hbase/procedure2/TestProcedureEvents.java | 6 +-
.../hbase/procedure2/TestProcedureExecution.java | 6 +-
.../hbase/procedure2/TestProcedureExecutor.java | 6 +-
.../procedure2/TestProcedureInMemoryChore.java | 6 +-
.../hbase/procedure2/TestProcedureMetrics.java | 6 +-
.../hbase/procedure2/TestProcedureNonce.java | 6 +-
.../hbase/procedure2/TestProcedureRecovery.java | 6 +-
.../hbase/procedure2/TestProcedureReplayOrder.java | 6 +-
.../procedure2/TestProcedureRollbackAIOOB.java | 4 +-
.../procedure2/TestProcedureSkipPersistence.java | 6 +-
.../hbase/procedure2/TestProcedureSuspended.java | 6 +-
...rocedureDispatcherUncaughtExceptionHandler.java | 4 +-
.../procedure2/TestStateMachineProcedure.java | 6 +-
.../hbase/procedure2/TestYieldProcedures.java | 6 +-
.../ProcedureWALLoaderPerformanceEvaluation.java | 4 +-
.../store/wal/TestStressWALProcedureStore.java | 6 +-
.../store/wal/TestWALProcedureStore.java | 6 +-
.../replication/TestReplicationStateZKImpl.java | 6 +-
.../replication/TestZKReplicationPeerStorage.java | 4 +-
.../replication/TestZKReplicationQueueStorage.java | 4 +-
hbase-rest/pom.xml | 17 +-
.../apache/hadoop/hbase/rest/RowResourceBase.java | 4 +-
.../apache/hadoop/hbase/rest/TestGzipFilter.java | 4 +-
.../hadoop/hbase/rest/TestMultiRowResource.java | 8 +-
.../hbase/rest/TestNamespacesInstanceResource.java | 4 +-
.../hadoop/hbase/rest/TestNamespacesResource.java | 4 +-
.../hadoop/hbase/rest/TestRESTServerSSL.java | 4 +-
.../hadoop/hbase/rest/TestResourceFilter.java | 4 +-
.../hadoop/hbase/rest/TestScannerResource.java | 4 +-
.../hadoop/hbase/rest/TestScannersWithFilters.java | 4 +-
.../hadoop/hbase/rest/TestScannersWithLabels.java | 4 +-
.../hadoop/hbase/rest/TestSchemaResource.java | 8 +-
.../hadoop/hbase/rest/TestSecureRESTServer.java | 12 +-
.../hbase/rest/TestSecurityHeadersFilter.java | 4 +-
.../hadoop/hbase/rest/TestStatusResource.java | 4 +-
.../hadoop/hbase/rest/TestTableResource.java | 4 +-
.../apache/hadoop/hbase/rest/TestTableScan.java | 4 +-
.../hadoop/hbase/rest/TestVersionResource.java | 4 +-
.../hbase/rest/client/TestRemoteAdminRetries.java | 4 +-
.../hbase/rest/client/TestRemoteHTableRetries.java | 4 +-
.../hadoop/hbase/rest/client/TestRemoteTable.java | 4 +-
.../org/apache/hadoop/hbase/MetaTableAccessor.java | 2 +-
.../hadoop/hbase/AcidGuaranteesTestBase.java | 2 +-
...BaseCluster.java => HBaseClusterInterface.java} | 17 +-
...seTestingUtility.java => HBaseTestingUtil.java} | 323 +++++++++++----------
.../org/apache/hadoop/hbase/MiniClusterRule.java | 51 ++--
.../hadoop/hbase/MockRegionServerServices.java | 6 +-
.../org/apache/hadoop/hbase/ProcedureTestUtil.java | 6 +-
...Cluster.java => SingleProcessHBaseCluster.java} | 127 ++++----
...rOption.java => StartTestingClusterOption.java} | 45 +--
.../apache/hadoop/hbase/TestCachedClusterId.java | 2 +-
.../hadoop/hbase/TestClientClusterMetrics.java | 8 +-
.../hadoop/hbase/TestClientClusterStatus.java | 8 +-
.../hadoop/hbase/TestClientOperationTimeout.java | 8 +-
.../apache/hadoop/hbase/TestClusterBootOrder.java | 4 +-
.../hadoop/hbase/TestClusterPortAssignment.java | 12 +-
.../TestColumnFamilyDescriptorDefaultVersions.java | 2 +-
.../hbase/TestFSTableDescriptorForceCreation.java | 2 +-
.../hadoop/hbase/TestFullLogReconstruction.java | 2 +-
.../hadoop/hbase/TestGlobalMemStoreSize.java | 8 +-
.../org/apache/hadoop/hbase/TestHBaseMetaEdit.java | 2 +-
.../hadoop/hbase/TestHBaseOnOtherDfsCluster.java | 4 +-
...stingUtility.java => TestHBaseTestingUtil.java} | 61 ++--
.../org/apache/hadoop/hbase/TestIOFencing.java | 4 +-
.../hbase/TestIPv6NIOServerSocketChannel.java | 4 +-
.../org/apache/hadoop/hbase/TestInfoServers.java | 2 +-
.../hadoop/hbase/TestJMXConnectorServer.java | 2 +-
.../org/apache/hadoop/hbase/TestJMXListener.java | 8 +-
.../apache/hadoop/hbase/TestLocalHBaseCluster.java | 7 +-
.../apache/hadoop/hbase/TestMetaTableAccessor.java | 4 +-
.../apache/hadoop/hbase/TestMetaTableLocator.java | 2 +-
.../hbase/TestMetaUpdatesGoToPriorityQueue.java | 4 +-
.../apache/hadoop/hbase/TestMovedRegionCache.java | 9 +-
.../org/apache/hadoop/hbase/TestMultiVersions.java | 6 +-
.../org/apache/hadoop/hbase/TestNamespace.java | 8 +-
.../hadoop/hbase/TestNodeHealthCheckChore.java | 2 +-
.../hbase/TestPartialResultsFromClientSide.java | 2 +-
.../org/apache/hadoop/hbase/TestRegionMetrics.java | 2 +-
.../apache/hadoop/hbase/TestRegionRebalancing.java | 10 +-
.../TestSequenceIdMonotonicallyIncreasing.java | 4 +-
.../TestServerSideScanMetricsFromClientSide.java | 2 +-
.../org/apache/hadoop/hbase/TestSplitMerge.java | 2 +-
.../org/apache/hadoop/hbase/TestZooKeeper.java | 10 +-
.../hadoop/hbase/backup/TestHFileArchiving.java | 4 +-
.../example/TestZooKeeperTableArchiveClient.java | 4 +-
.../AbstractTestAsyncTableRegionReplicasRead.java | 4 +-
.../hbase/client/AbstractTestAsyncTableScan.java | 5 +-
.../hadoop/hbase/client/AbstractTestCITimeout.java | 4 +-
.../hbase/client/AbstractTestRegionLocator.java | 6 +-
.../hbase/client/AbstractTestScanCursor.java | 4 +-
.../client/AbstractTestUpdateConfiguration.java | 6 +-
.../hbase/client/ClientPushbackTestBase.java | 4 +-
.../client/CloneSnapshotFromClientTestBase.java | 6 +-
.../hadoop/hbase/client/FromClientSideBase.java | 16 +-
.../hbase/client/MetaWithReplicasTestBase.java | 12 +-
.../hbase/client/RegionReplicaTestHelper.java | 12 +-
.../client/RestoreSnapshotFromClientTestBase.java | 6 +-
.../hbase/client/SnapshotWithAclTestBase.java | 10 +-
.../org/apache/hadoop/hbase/client/TestAdmin.java | 2 +-
.../org/apache/hadoop/hbase/client/TestAdmin2.java | 4 +-
.../apache/hadoop/hbase/client/TestAdminBase.java | 4 +-
.../hbase/client/TestAlwaysSetScannerId.java | 4 +-
.../hbase/client/TestAppendFromClientSide.java | 4 +-
.../hadoop/hbase/client/TestAsyncAdminBase.java | 8 +-
.../hadoop/hbase/client/TestAsyncAdminBuilder.java | 4 +-
.../client/TestAsyncAdminWithRegionReplicas.java | 4 +-
.../hbase/client/TestAsyncBufferMutator.java | 4 +-
.../TestAsyncClientPauseForCallQueueTooBig.java | 4 +-
.../hbase/client/TestAsyncClusterAdminApi.java | 4 +-
.../hbase/client/TestAsyncMetaRegionLocator.java | 6 +-
.../client/TestAsyncNonMetaRegionLocator.java | 6 +-
...stAsyncNonMetaRegionLocatorConcurrenyLimit.java | 4 +-
.../hbase/client/TestAsyncRegionLocator.java | 4 +-
.../TestAsyncReplicationAdminApiWithClusters.java | 6 +-
.../TestAsyncSingleRequestRpcRetryingCaller.java | 4 +-
.../apache/hadoop/hbase/client/TestAsyncTable.java | 4 +-
.../hadoop/hbase/client/TestAsyncTableBatch.java | 4 +-
.../TestAsyncTableBatchRetryImmediately.java | 4 +-
.../client/TestAsyncTableGetMultiThreaded.java | 4 +-
.../hbase/client/TestAsyncTableLocatePrefetch.java | 6 +-
.../TestAsyncTableLocateRegionForDeletedTable.java | 4 +-
.../hbase/client/TestAsyncTableNoncedRetry.java | 4 +-
.../hbase/client/TestAsyncTableRSCrashPublish.java | 4 +-
.../hbase/client/TestAsyncTableScanException.java | 4 +-
.../hbase/client/TestAsyncTableScanMetrics.java | 4 +-
.../hbase/client/TestAsyncTableScanRenewLease.java | 4 +-
.../TestAsyncTableScannerCloseWhileSuspending.java | 4 +-
.../client/TestAsyncTableUseMetaReplicas.java | 6 +-
.../TestAvoidCellReferencesIntoShippedBlocks.java | 4 +-
.../hbase/client/TestBlockEvictionFromClient.java | 4 +-
.../hadoop/hbase/client/TestBufferedMutator.java | 4 +-
...estCatalogReplicaLoadBalanceSimpleSelector.java | 8 +-
.../hadoop/hbase/client/TestCheckAndMutate.java | 4 +-
.../client/TestCheckAndMutateWithByteBuff.java | 5 +-
.../hbase/client/TestCleanupMetaReplica.java | 4 +-
.../hbase/client/TestClientOperationInterrupt.java | 6 +-
.../hbase/client/TestClientScannerRPCTimeout.java | 6 +-
.../hadoop/hbase/client/TestClientTimeouts.java | 4 +-
.../apache/hadoop/hbase/client/TestConnection.java | 4 +-
.../hbase/client/TestDropTimeoutRequest.java | 4 +-
.../hadoop/hbase/client/TestEnableTable.java | 10 +-
.../client/TestFailedMetaReplicaAssigment.java | 11 +-
.../hadoop/hbase/client/TestFlushFromClient.java | 4 +-
.../hadoop/hbase/client/TestFromClientSide.java | 22 +-
.../hadoop/hbase/client/TestFromClientSide3.java | 6 +-
.../hadoop/hbase/client/TestFromClientSide4.java | 4 +-
.../hbase/client/TestFromClientSideNoCodec.java | 4 +-
.../client/TestFromClientSideScanExcpetion.java | 4 +-
.../hbase/client/TestGetProcedureResult.java | 4 +-
.../TestGetScanColumnsWithNewVersionBehavior.java | 4 +-
.../hbase/client/TestGetScanPartialResult.java | 4 +-
.../org/apache/hadoop/hbase/client/TestHbck.java | 4 +-
.../hbase/client/TestIllegalTableDescriptor.java | 4 +-
.../hbase/client/TestIncrementsFromClientSide.java | 16 +-
.../hbase/client/TestIntraRowPagination.java | 8 +-
.../TestInvalidMutationDurabilityException.java | 4 +-
.../hbase/client/TestLimitedScanWithFilter.java | 4 +-
.../hbase/client/TestMalformedCellFromClient.java | 4 +-
.../hadoop/hbase/client/TestMasterRegistry.java | 10 +-
.../apache/hadoop/hbase/client/TestMetaCache.java | 4 +-
.../hbase/client/TestMetaRegionLocationCache.java | 6 +-
.../client/TestMetaTableAccessorNoCluster.java | 4 +-
.../TestMetaWithReplicasShutdownHandling.java | 4 +-
...oneSnapshotFromClientCloneLinksAfterDelete.java | 4 +-
.../TestMobCloneSnapshotFromClientNormal.java | 4 +-
...oreSnapshotFromClientAfterSplittingRegions.java | 4 +-
...tMobRestoreSnapshotFromClientAfterTruncate.java | 4 +-
.../TestMobRestoreSnapshotFromClientClone.java | 4 +-
...estoreSnapshotFromClientGetCompactionState.java | 4 +-
...stMobRestoreSnapshotFromClientSchemaChange.java | 4 +-
.../TestMobRestoreSnapshotFromClientSimple.java | 4 +-
.../client/TestMultiActionMetricsFromClient.java | 4 +-
.../hadoop/hbase/client/TestMultiParallel.java | 6 +-
.../hbase/client/TestMultiRespectsLimits.java | 6 +-
.../hbase/client/TestMultipleTimestamps.java | 4 +-
.../hbase/client/TestMutationGetCellBuilder.java | 4 +-
.../hbase/client/TestMvccConsistentScanner.java | 4 +-
.../hbase/client/TestPreadReversedScanner.java | 4 +-
.../hadoop/hbase/client/TestPutWithDelete.java | 4 +-
.../TestRawAsyncTableLimitedScanWithFilter.java | 4 +-
.../hbase/client/TestRawAsyncTablePartialScan.java | 4 +-
.../hbase/client/TestRegionLocationCaching.java | 4 +-
.../hbase/client/TestReplicaWithCluster.java | 14 +-
.../hadoop/hbase/client/TestReplicasClient.java | 8 +-
.../hbase/client/TestRequestTooBigException.java | 4 +-
.../hbase/client/TestResultFromCoprocessor.java | 4 +-
.../hbase/client/TestResultSizeEstimation.java | 4 +-
.../hbase/client/TestScanWithoutFetchingData.java | 4 +-
.../hadoop/hbase/client/TestScannerTimeout.java | 6 +-
.../hbase/client/TestScannersFromClientSide.java | 14 +-
.../hbase/client/TestScannersFromClientSide2.java | 4 +-
.../hbase/client/TestSeparateClientZKCluster.java | 24 +-
.../hbase/client/TestServerBusyException.java | 4 +-
.../hbase/client/TestServerLoadDurability.java | 6 +-
.../hadoop/hbase/client/TestSizeFailures.java | 4 +-
.../client/TestSnapshotCloneIndependence.java | 4 +-
.../hbase/client/TestSnapshotFromClient.java | 4 +-
.../hadoop/hbase/client/TestSnapshotMetadata.java | 4 +-
.../client/TestSnapshotTemporaryDirectory.java | 4 +-
.../hbase/client/TestSplitOrMergeAtTableLevel.java | 4 +-
.../hbase/client/TestSplitOrMergeStatus.java | 4 +-
.../hadoop/hbase/client/TestTableFavoredNodes.java | 4 +-
.../hbase/client/TestTableOperationException.java | 4 +-
.../hbase/client/TestTableSnapshotScanner.java | 18 +-
.../hadoop/hbase/client/TestTimestampsFilter.java | 4 +-
.../hbase/client/TestUpdateConfiguration.java | 8 +-
.../hbase/client/TestZKConnectionRegistry.java | 6 +-
.../TestReplicationAdminForSyncReplication.java | 6 +-
.../hadoop/hbase/constraint/TestConstraint.java | 6 +-
.../hbase/coprocessor/TestAppendTimeRange.java | 4 +-
.../coprocessor/TestCoprocessorInterface.java | 16 +-
.../hbase/coprocessor/TestCoprocessorMetrics.java | 4 +-
.../TestCoprocessorSharedConnection.java | 4 +-
.../hbase/coprocessor/TestCoprocessorStop.java | 8 +-
.../coprocessor/TestCoreMasterCoprocessor.java | 4 +-
.../coprocessor/TestCoreRegionCoprocessor.java | 4 +-
.../TestCoreRegionServerCoprocessor.java | 4 +-
.../TestIncrementAndAppendWithNullResult.java | 4 +-
.../hbase/coprocessor/TestIncrementTimeRange.java | 4 +-
.../TestMasterCoprocessorExceptionWithAbort.java | 12 +-
.../TestMasterCoprocessorExceptionWithRemove.java | 8 +-
.../hbase/coprocessor/TestMasterObserver.java | 30 +-
.../TestMasterObserverToModifyTableSchema.java | 4 +-
.../hbase/coprocessor/TestMetaTableMetrics.java | 6 +-
...estNegativeMemStoreSizeWithSlowCoprocessor.java | 4 +-
.../coprocessor/TestOpenTableInCoprocessor.java | 4 +-
.../TestPassCustomCellViaRegionObserver.java | 4 +-
.../TestPostIncrementAndAppendBeforeWAL.java | 4 +-
.../coprocessor/TestRegionObserverBypass.java | 6 +-
...ObserverForAddingMutationsFromCoprocessors.java | 6 +-
.../coprocessor/TestRegionObserverInterface.java | 8 +-
.../TestRegionObserverScannerOpenHook.java | 14 +-
.../coprocessor/TestRegionObserverStacking.java | 10 +-
...tRegionServerCoprocessorExceptionWithAbort.java | 8 +-
...RegionServerCoprocessorExceptionWithRemove.java | 4 +-
.../hadoop/hbase/coprocessor/TestWALObserver.java | 6 +-
.../hadoop/hbase/filter/FilterTestingCluster.java | 4 +-
.../hbase/filter/TestColumnPrefixFilter.java | 18 +-
.../hadoop/hbase/filter/TestColumnRangeFilter.java | 4 +-
.../hbase/filter/TestDependentColumnFilter.java | 8 +-
.../org/apache/hadoop/hbase/filter/TestFilter.java | 12 +-
.../hbase/filter/TestFilterFromRegionSide.java | 6 +-
.../hadoop/hbase/filter/TestFilterListOnMini.java | 4 +-
.../filter/TestFilterListOrOperatorWithBlkCnt.java | 4 +-
.../hadoop/hbase/filter/TestFilterWrapper.java | 4 +-
.../TestFiltersWithBinaryComponentComparator.java | 4 +-
.../filter/TestFuzzyRowAndColumnRangeFilter.java | 4 +-
.../hbase/filter/TestFuzzyRowFilterEndToEnd.java | 4 +-
.../hbase/filter/TestInvocationRecordFilter.java | 6 +-
.../hbase/filter/TestMultiRowRangeFilter.java | 4 +-
.../filter/TestMultipleColumnPrefixFilter.java | 18 +-
.../TestQualifierFilterWithEmptyQualifier.java | 8 +-
.../apache/hadoop/hbase/fs/TestBlockReorder.java | 6 +-
.../hbase/fs/TestBlockReorderBlockLocation.java | 10 +-
.../hbase/fs/TestBlockReorderMultiBlocks.java | 10 +-
.../hadoop/hbase/http/TestInfoServersACL.java | 4 +-
.../org/apache/hadoop/hbase/io/TestFileLink.java | 10 +-
.../hadoop/hbase/io/TestHalfStoreFileReader.java | 6 +-
.../hbase/io/encoding/TestChangingEncoding.java | 4 +-
.../hbase/io/encoding/TestDataBlockEncoders.java | 4 +-
.../hbase/io/encoding/TestEncodedSeekers.java | 4 +-
.../io/encoding/TestSeekBeforeWithReverseScan.java | 8 +-
.../io/encoding/TestSeekToBlockWithEncoders.java | 4 +-
.../hadoop/hbase/io/hfile/TestBlockIOUtils.java | 4 +-
.../hadoop/hbase/io/hfile/TestCacheConfig.java | 4 +-
.../hadoop/hbase/io/hfile/TestCacheOnWrite.java | 8 +-
.../apache/hadoop/hbase/io/hfile/TestChecksum.java | 6 +-
.../hbase/io/hfile/TestCombinedBlockCache.java | 4 +-
.../hbase/io/hfile/TestFixedFileTrailer.java | 4 +-
.../io/hfile/TestForceCacheImportantBlocks.java | 4 +-
.../apache/hadoop/hbase/io/hfile/TestHFile.java | 8 +-
.../hadoop/hbase/io/hfile/TestHFileBlock.java | 4 +-
.../hadoop/hbase/io/hfile/TestHFileBlockIndex.java | 10 +-
.../hadoop/hbase/io/hfile/TestHFileEncryption.java | 4 +-
.../TestHFileInlineToRootChunkConversion.java | 4 +-
.../hbase/io/hfile/TestHFilePrettyPrinter.java | 4 +-
.../hadoop/hbase/io/hfile/TestHFileReaderImpl.java | 4 +-
.../hfile/TestHFileScannerImplReferenceCount.java | 4 +-
.../hadoop/hbase/io/hfile/TestHFileSeek.java | 4 +-
.../hadoop/hbase/io/hfile/TestHFileWriterV3.java | 10 +-
.../hfile/TestHFileWriterV3WithDataEncoders.java | 6 +-
.../io/hfile/TestLazyDataBlockDecompression.java | 4 +-
.../apache/hadoop/hbase/io/hfile/TestPrefetch.java | 4 +-
.../apache/hadoop/hbase/io/hfile/TestReseekTo.java | 4 +-
.../hbase/io/hfile/TestRowIndexV1DataEncoder.java | 4 +-
.../hbase/io/hfile/TestScannerFromBucketCache.java | 18 +-
.../hfile/TestScannerSelectionUsingKeyRange.java | 8 +-
.../io/hfile/TestScannerSelectionUsingTTL.java | 8 +-
.../io/hfile/TestSeekBeforeWithInlineBlocks.java | 6 +-
.../apache/hadoop/hbase/io/hfile/TestSeekTo.java | 4 +-
.../hbase/io/hfile/bucket/TestBucketCache.java | 6 +-
.../io/hfile/bucket/TestVerifyBucketCacheFile.java | 8 +-
.../hbase/ipc/TestMasterFifoRpcScheduler.java | 4 +-
.../hadoop/hbase/ipc/TestNettyRpcServer.java | 6 +-
.../hadoop/hbase/ipc/TestRpcClientLeaks.java | 6 +-
.../hadoop/hbase/master/AbstractTestDLS.java | 24 +-
.../hbase/master/AbstractTestRestartCluster.java | 4 +-
.../hbase/master/TestActiveMasterManager.java | 4 +-
.../hbase/master/TestAlwaysStandByHMaster.java | 8 +-
.../hbase/master/TestAssignmentManagerMetrics.java | 8 +-
.../apache/hadoop/hbase/master/TestBalancer.java | 4 +-
.../hbase/master/TestClientMetaServiceRPCs.java | 8 +-
.../hbase/master/TestCloseAnOpeningRegion.java | 10 +-
.../hbase/master/TestClusterRestartFailover.java | 6 +-
.../apache/hadoop/hbase/master/TestDeadServer.java | 4 +-
.../hadoop/hbase/master/TestGetInfoPort.java | 4 +-
.../hbase/master/TestGetLastFlushedSequenceId.java | 8 +-
.../hbase/master/TestGetReplicationLoad.java | 14 +-
.../hbase/master/TestHMasterCommandLine.java | 4 +-
.../hbase/master/TestHMasterRPCException.java | 4 +-
.../hbase/master/TestLoadProcedureError.java | 4 +-
.../org/apache/hadoop/hbase/master/TestMaster.java | 10 +-
.../master/TestMasterAbortAndRSGotKilled.java | 4 +-
.../hbase/master/TestMasterBalanceThrottling.java | 4 +-
.../hbase/master/TestMasterChoreScheduled.java | 8 +-
.../hadoop/hbase/master/TestMasterFailover.java | 16 +-
.../TestMasterFailoverBalancerPersistence.java | 17 +-
.../hadoop/hbase/master/TestMasterFileSystem.java | 4 +-
.../master/TestMasterFileSystemWithWALDir.java | 8 +-
.../TestMasterHandlerFullWhenTransitRegion.java | 4 +-
.../hadoop/hbase/master/TestMasterMetrics.java | 17 +-
.../hbase/master/TestMasterMetricsWrapper.java | 4 +-
.../hadoop/hbase/master/TestMasterNoCluster.java | 4 +-
.../hbase/master/TestMasterNotCarryTable.java | 4 +-
.../TestMasterOperationsForRegionReplicas.java | 14 +-
.../hadoop/hbase/master/TestMasterRepairMode.java | 12 +-
.../TestMasterRestartAfterDisablingTable.java | 16 +-
.../hadoop/hbase/master/TestMasterShutdown.java | 20 +-
.../hadoop/hbase/master/TestMasterTransitions.java | 4 +-
.../master/TestMergeTableRegionsWhileRSCrash.java | 4 +-
.../master/TestMetaAssignmentWithStopMaster.java | 8 +-
.../hbase/master/TestMetaShutdownHandler.java | 14 +-
.../hbase/master/TestMigrateNamespaceTable.java | 8 +-
.../master/TestNewStartedRegionServerVersion.java | 4 +-
.../hadoop/hbase/master/TestRegionPlacement.java | 10 +-
.../hadoop/hbase/master/TestRegionPlacement2.java | 4 +-
.../hbase/master/TestRegionPlansWithThrottle.java | 8 +-
.../hbase/master/TestRegionsRecoveryChore.java | 4 +-
.../master/TestRegionsRecoveryConfigManager.java | 14 +-
.../master/TestRetainAssignmentOnRestart.java | 10 +-
.../hadoop/hbase/master/TestRollingRestart.java | 26 +-
.../master/TestRoundRobinAssignmentOnRestart.java | 4 +-
.../TestServerCrashProcedureCarryingMetaStuck.java | 4 +-
.../master/TestServerCrashProcedureStuck.java | 4 +-
.../hbase/master/TestShutdownBackupMaster.java | 12 +-
.../master/TestShutdownWithNoRegionServer.java | 4 +-
.../hadoop/hbase/master/TestSplitLogManager.java | 6 +-
.../hbase/master/TestSplitRegionWhileRSCrash.java | 4 +-
.../hadoop/hbase/master/TestSplitWALManager.java | 10 +-
.../hadoop/hbase/master/TestWarmupRegion.java | 8 +-
.../master/assignment/AssignmentTestingUtil.java | 24 +-
...estAssignRegionToUninitializedRegionServer.java | 4 +-
.../master/assignment/TestAssignmentManager.java | 4 +-
.../assignment/TestAssignmentManagerBase.java | 6 +-
.../TestAssignmentManagerLoadMetaRegionState.java | 4 +-
.../assignment/TestAssignmentManagerUtil.java | 4 +-
.../master/assignment/TestAssignmentOnRSCrash.java | 6 +-
.../assignment/TestCloseRegionWhileRSCrash.java | 4 +-
.../TestDeadServerMetricRegionChore.java | 6 +-
.../assignment/TestExceptionInAssignRegion.java | 4 +-
.../TestExceptionInUnassignedRegion.java | 4 +-
.../TestMasterAbortWhileMergingTable.java | 4 +-
.../assignment/TestMergeTableRegionsProcedure.java | 4 +-
.../assignment/TestModifyTableWhileMerging.java | 4 +-
.../assignment/TestOpenRegionProcedureBackoff.java | 4 +-
.../assignment/TestOpenRegionProcedureHang.java | 10 +-
.../assignment/TestRaceBetweenSCPAndDTP.java | 4 +-
.../assignment/TestRaceBetweenSCPAndTRSP.java | 4 +-
.../TestRegionAssignedToMultipleRegionServers.java | 10 +-
.../hbase/master/assignment/TestRegionBypass.java | 4 +-
.../assignment/TestRegionMoveAndAbandon.java | 15 +-
.../master/assignment/TestRegionReplicaSplit.java | 6 +-
.../hbase/master/assignment/TestRegionSplit.java | 10 +-
.../TestRegionSplitAndSeparateChildren.java | 10 +-
.../master/assignment/TestRegionStateStore.java | 4 +-
.../hbase/master/assignment/TestRegionStates.java | 4 +-
.../assignment/TestReportOnlineRegionsRace.java | 4 +-
...tReportRegionStateTransitionFromDeadServer.java | 4 +-
.../TestReportRegionStateTransitionRetry.java | 4 +-
.../master/assignment/TestRogueRSAssignment.java | 8 +-
.../master/assignment/TestSCPGetRegionsRace.java | 8 +-
.../assignment/TestSplitTableRegionProcedure.java | 4 +-
.../TestTransitRegionStateProcedure.java | 4 +-
.../assignment/TestWakeUpUnexpectedProcedure.java | 10 +-
.../TestBalancerStatusTagInJMXMetrics.java | 10 +-
.../balancer/TestFavoredNodeTableImport.java | 4 +-
.../TestFavoredStochasticBalancerPickers.java | 8 +-
.../TestFavoredStochasticLoadBalancer.java | 8 +-
.../balancer/TestStochasticBalancerJmxMetrics.java | 6 +-
...BalancerHeterogeneousCostRulesLoadFromHDFS.java | 4 +-
.../hbase/master/cleaner/TestCleanerChore.java | 6 +-
.../hbase/master/cleaner/TestHFileCleaner.java | 4 +-
.../hbase/master/cleaner/TestHFileLinkCleaner.java | 4 +-
.../hbase/master/cleaner/TestLogsCleaner.java | 4 +-
.../cleaner/TestReplicationBarrierCleaner.java | 4 +-
.../cleaner/TestReplicationHFileCleaner.java | 4 +-
.../master/cleaner/TestSnapshotCleanerChore.java | 6 +-
.../master/cleaner/TestSnapshotFromMaster.java | 4 +-
.../hbase/master/janitor/TestCatalogJanitor.java | 6 +-
.../master/janitor/TestCatalogJanitorCluster.java | 4 +-
.../janitor/TestCatalogJanitorInMemoryStates.java | 4 +-
.../hadoop/hbase/master/janitor/TestMetaFixer.java | 20 +-
.../hbase/master/locking/TestLockManager.java | 4 +-
.../hbase/master/locking/TestLockProcedure.java | 4 +-
...gionNormalizerManagerConfigurationObserver.java | 4 +-
.../normalizer/TestRegionNormalizerWorker.java | 6 +-
.../TestSimpleRegionNormalizerOnCluster.java | 4 +-
...terProcedureSchedulerPerformanceEvaluation.java | 4 +-
.../procedure/MasterProcedureTestingUtility.java | 12 +-
.../procedure/TestCreateNamespaceProcedure.java | 4 +-
.../TestCreateTableProcedureMuitipleRegions.java | 4 +-
.../TestDeleteColumnFamilyProcedureFromClient.java | 4 +-
.../procedure/TestDeleteNamespaceProcedure.java | 4 +-
.../hadoop/hbase/master/procedure/TestHBCKSCP.java | 8 +-
.../master/procedure/TestIgnoreUnknownFamily.java | 4 +-
.../TestMasterFailoverWithProcedures.java | 10 +-
.../procedure/TestMasterObserverPostCalls.java | 4 +-
.../procedure/TestMasterProcedureEvents.java | 4 +-
.../procedure/TestModifyNamespaceProcedure.java | 4 +-
.../hbase/master/procedure/TestProcedureAdmin.java | 4 +-
.../master/procedure/TestProcedurePriority.java | 4 +-
.../TestReopenTableRegionsProcedureBackoff.java | 4 +-
...estReopenTableRegionsProcedureInfiniteLoop.java | 4 +-
.../hadoop/hbase/master/procedure/TestSCP.java | 6 +-
.../hadoop/hbase/master/procedure/TestSCPBase.java | 20 +-
.../procedure/TestSafemodeBringsDownMaster.java | 4 +-
.../procedure/TestSchedulerQueueDeadLock.java | 4 +-
.../procedure/TestServerRemoteProcedure.java | 6 +-
.../master/procedure/TestSplitWALProcedure.java | 6 +-
.../procedure/TestTableDDLProcedureBase.java | 4 +-
.../TestTableDescriptorModificationFromClient.java | 4 +-
.../procedure/TestWALProcedureStoreOnHDFS.java | 4 +-
.../hbase/master/region/MasterRegionTestBase.java | 6 +-
.../region/TestMasterRegionOnTwoFileSystems.java | 8 +-
.../TestModifyPeerProcedureRetryBackoff.java | 4 +-
.../TestSyncReplicationReplayWALManager.java | 4 +-
...itPeerSyncReplicationStateProcedureBackoff.java | 4 +-
.../master/snapshot/TestSnapshotFileCache.java | 4 +-
.../master/snapshot/TestSnapshotHFileCleaner.java | 4 +-
.../hbase/master/snapshot/TestSnapshotManager.java | 4 +-
.../snapshot/TestSnapshotWhileRSCrashes.java | 4 +-
.../master/snapshot/TestTakeSnapshotHandler.java | 6 +-
.../hadoop/hbase/mob/MobStressToolRunner.java | 4 +-
.../org/apache/hadoop/hbase/mob/MobTestUtil.java | 4 +-
.../apache/hadoop/hbase/mob/TestCachedMobFile.java | 4 +-
.../hbase/mob/TestDefaultMobStoreFlusher.java | 4 +-
.../hbase/mob/TestExpiredMobFileCleaner.java | 4 +-
.../hbase/mob/TestMobCompactionWithDefaults.java | 6 +-
.../hadoop/hbase/mob/TestMobDataBlockEncoding.java | 4 +-
.../org/apache/hadoop/hbase/mob/TestMobFile.java | 4 +-
.../apache/hadoop/hbase/mob/TestMobFileCache.java | 8 +-
.../hadoop/hbase/mob/TestMobFileCleanerChore.java | 6 +-
.../apache/hadoop/hbase/mob/TestMobFileName.java | 4 +-
.../hadoop/hbase/mob/TestMobStoreCompaction.java | 12 +-
.../hadoop/hbase/mob/TestMobStoreScanner.java | 4 +-
.../hbase/mob/TestMobWithByteBuffAllocator.java | 4 +-
.../hbase/namequeues/TestNamedQueueRecorder.java | 4 +-
.../hbase/namequeues/TestSlowLogAccessor.java | 4 +-
.../hbase/namespace/TestNamespaceAuditor.java | 14 +-
.../hbase/procedure/TestFailedProcCleanup.java | 4 +-
.../hbase/procedure/TestProcedureManager.java | 4 +-
.../hadoop/hbase/procedure/TestZKProcedure.java | 4 +-
.../procedure/TestZKProcedureControllers.java | 4 +-
.../store/region/RegionProcedureStoreTestBase.java | 6 +-
.../region/TestRegionProcedureStoreMigration.java | 6 +-
.../hbase/quotas/SpaceQuotaHelperForTests.java | 12 +-
.../quotas/TestClusterScopeQuotaThrottle.java | 4 +-
.../hbase/quotas/TestFileArchiverNotifierImpl.java | 4 +-
.../hbase/quotas/TestLowLatencySpaceQuotas.java | 4 +-
.../hbase/quotas/TestMasterQuotasObserver.java | 4 +-
.../apache/hadoop/hbase/quotas/TestQuotaAdmin.java | 4 +-
.../TestQuotaObserverChoreRegionReports.java | 4 +-
.../TestQuotaObserverChoreWithMiniCluster.java | 4 +-
.../hadoop/hbase/quotas/TestQuotaStatusRPCs.java | 4 +-
.../hadoop/hbase/quotas/TestQuotaTableUtil.java | 4 +-
.../hadoop/hbase/quotas/TestQuotaThrottle.java | 4 +-
.../hadoop/hbase/quotas/TestRegionSizeUse.java | 8 +-
.../quotas/TestSnapshotQuotaObserverChore.java | 4 +-
.../quotas/TestSpaceQuotaBasicFunctioning.java | 4 +-
.../hbase/quotas/TestSpaceQuotaDropTable.java | 4 +-
.../hbase/quotas/TestSpaceQuotaIncrease.java | 4 +-
.../hbase/quotas/TestSpaceQuotaOnBulkLoad.java | 4 +-
.../quotas/TestSpaceQuotaOnNonExistingTables.java | 4 +-
.../hadoop/hbase/quotas/TestSpaceQuotaRemoval.java | 4 +-
.../hbase/quotas/TestSpaceQuotaSwitchPolicies.java | 4 +-
.../quotas/TestSpaceQuotasWithRegionReplicas.java | 4 +-
.../hbase/quotas/TestSpaceQuotasWithSnapshots.java | 4 +-
.../quotas/TestSuperUserQuotaPermissions.java | 4 +-
.../hadoop/hbase/quotas/ThrottleQuotaTestUtil.java | 16 +-
.../regionserver/EncodedSeekPerformanceTest.java | 4 +-
.../hadoop/hbase/regionserver/MockHStoreFile.java | 4 +-
.../hbase/regionserver/TestAtomicOperation.java | 8 +-
.../hadoop/hbase/regionserver/TestBlocksRead.java | 20 +-
.../hbase/regionserver/TestBlocksScanned.java | 8 +-
.../regionserver/TestBulkLoadReplication.java | 14 +-
.../hbase/regionserver/TestBulkloadBase.java | 4 +-
.../regionserver/TestCacheOnWriteInSchema.java | 4 +-
.../TestCleanupCompactedFileAfterFailover.java | 6 +-
.../TestCleanupCompactedFileOnRegionClose.java | 6 +-
.../hbase/regionserver/TestCleanupMetaWAL.java | 4 +-
.../regionserver/TestClearRegionBlockCache.java | 8 +-
.../hadoop/hbase/regionserver/TestClusterId.java | 14 +-
.../hbase/regionserver/TestColumnSeeking.java | 10 +-
.../hbase/regionserver/TestCompactSplitThread.java | 4 +-
.../hbase/regionserver/TestCompactingMemStore.java | 6 +-
.../hadoop/hbase/regionserver/TestCompaction.java | 10 +-
.../TestCompactionArchiveConcurrentClose.java | 6 +-
.../TestCompactionArchiveIOException.java | 6 +-
.../regionserver/TestCompactionFileNotFound.java | 4 +-
.../TestCompactionInDeadRegionServer.java | 4 +-
.../TestCompactionLifeCycleTracker.java | 4 +-
.../hbase/regionserver/TestCompactionPolicy.java | 4 +-
.../hbase/regionserver/TestCompactionState.java | 4 +-
.../regionserver/TestCompactionWithByteBuff.java | 6 +-
.../hbase/regionserver/TestCompactorMemLeak.java | 4 +-
.../regionserver/TestCompoundBloomFilter.java | 6 +-
.../regionserver/TestDataBlockEncodingTool.java | 4 +-
.../hbase/regionserver/TestDefaultMemStore.java | 6 +-
.../hbase/regionserver/TestDeleteMobTable.java | 4 +-
.../hbase/regionserver/TestEncryptionDisabled.java | 4 +-
.../regionserver/TestEncryptionKeyRotation.java | 4 +-
.../regionserver/TestEncryptionRandomKeying.java | 4 +-
.../regionserver/TestEndToEndSplitTransaction.java | 4 +-
.../hbase/regionserver/TestFSErrorsExposed.java | 8 +-
.../regionserver/TestFailedAppendAndSync.java | 8 +-
.../regionserver/TestFlushLifeCycleTracker.java | 4 +-
.../regionserver/TestGetClosestAtOrBefore.java | 14 +-
.../hadoop/hbase/regionserver/TestHMobStore.java | 4 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 124 ++++----
.../hbase/regionserver/TestHRegionFileSystem.java | 6 +-
.../hbase/regionserver/TestHRegionOnCluster.java | 8 +-
.../regionserver/TestHRegionReplayEvents.java | 10 +-
.../regionserver/TestHRegionServerBulkLoad.java | 10 +-
.../hbase/regionserver/TestHRegionTracing.java | 6 +-
.../regionserver/TestHRegionWithInMemoryFlush.java | 8 +-
.../hadoop/hbase/regionserver/TestHStore.java | 24 +-
.../hadoop/hbase/regionserver/TestHStoreFile.java | 4 +-
.../regionserver/TestHdfsSnapshotHRegion.java | 4 +-
.../hbase/regionserver/TestHeapMemoryManager.java | 4 +-
.../hbase/regionserver/TestIsDeleteFailure.java | 4 +-
.../hbase/regionserver/TestJoinedScanners.java | 8 +-
.../hadoop/hbase/regionserver/TestKeepDeletes.java | 32 +-
.../hadoop/hbase/regionserver/TestLogRoller.java | 4 +-
.../hbase/regionserver/TestMajorCompaction.java | 10 +-
.../regionserver/TestMasterAddressTracker.java | 4 +-
.../regionserver/TestMemStoreSegmentsIterator.java | 6 +-
.../hadoop/hbase/regionserver/TestMinVersions.java | 20 +-
.../hbase/regionserver/TestMinorCompaction.java | 10 +-
.../hbase/regionserver/TestMultiColumnScanner.java | 6 +-
.../hbase/regionserver/TestMultiLogThreshold.java | 6 +-
.../hbase/regionserver/TestMutateRowsRecovery.java | 10 +-
.../TestNewVersionBehaviorFromClientSide.java | 4 +-
...estNotCleanupCompactedFileWhenRegionWarmup.java | 6 +-
.../TestOpenRegionFailedMemoryLeak.java | 6 +-
.../TestOpenSeqNumUnexpectedIncrease.java | 4 +-
.../hadoop/hbase/regionserver/TestParallelPut.java | 6 +-
.../regionserver/TestPerColumnFamilyFlush.java | 18 +-
.../hadoop/hbase/regionserver/TestPriorityRpc.java | 4 +-
.../hbase/regionserver/TestRSChoresScheduled.java | 8 +-
.../regionserver/TestRSKilledWhenInitializing.java | 12 +-
.../TestReadAndWriteRegionInfoFile.java | 12 +-
.../hbase/regionserver/TestRecoveredEdits.java | 6 +-
.../TestRecoveredEditsReplayAndAbort.java | 10 +-
.../hbase/regionserver/TestRegionFavoredNodes.java | 4 +-
.../hbase/regionserver/TestRegionIncrement.java | 6 +-
.../hadoop/hbase/regionserver/TestRegionInfo.java | 10 +-
.../hbase/regionserver/TestRegionInterrupt.java | 4 +-
.../TestRegionMergeTransactionOnCluster.java | 16 +-
.../hadoop/hbase/regionserver/TestRegionMove.java | 4 +-
.../hadoop/hbase/regionserver/TestRegionOpen.java | 4 +-
.../regionserver/TestRegionReplicaFailover.java | 10 +-
.../hbase/regionserver/TestRegionReplicas.java | 12 +-
.../TestRegionReplicasAreDistributed.java | 4 +-
.../TestRegionReplicasWithModifyTable.java | 6 +-
.../TestRegionReplicasWithRestartScenarios.java | 4 +-
.../hbase/regionserver/TestRegionServerAbort.java | 15 +-
.../regionserver/TestRegionServerAbortTimeout.java | 13 +-
.../TestRegionServerCrashDisableWAL.java | 4 +-
.../regionserver/TestRegionServerHostname.java | 14 +-
.../regionserver/TestRegionServerMetrics.java | 10 +-
.../regionserver/TestRegionServerNoMaster.java | 16 +-
.../TestRegionServerOnlineConfigChange.java | 4 +-
.../TestRegionServerReadRequestMetrics.java | 4 +-
.../TestRegionServerReportForDuty.java | 16 +-
.../regionserver/TestRemoveRegionMetrics.java | 10 +-
.../regionserver/TestRequestsPerSecondMetric.java | 4 +-
.../hbase/regionserver/TestResettingCounters.java | 10 +-
.../hbase/regionserver/TestReversibleScanners.java | 4 +-
.../regionserver/TestRowPrefixBloomFilter.java | 4 +-
.../hadoop/hbase/regionserver/TestRowTooBig.java | 12 +-
.../regionserver/TestSCVFWithMiniCluster.java | 4 +-
.../hbase/regionserver/TestScanWithBloomError.java | 6 +-
.../hadoop/hbase/regionserver/TestScanner.java | 26 +-
.../regionserver/TestScannerHeartbeatMessages.java | 4 +-
.../regionserver/TestScannerRPCScanMetrics.java | 10 +-
.../regionserver/TestScannerRetriableFailure.java | 4 +-
.../regionserver/TestScannerWithBulkload.java | 4 +-
.../regionserver/TestScannerWithCorruptHFile.java | 4 +-
.../regionserver/TestSecureBulkLoadManager.java | 4 +-
.../hbase/regionserver/TestSeekOptimizations.java | 12 +-
.../TestSettingTimeoutOnBlockingPoint.java | 4 +-
.../regionserver/TestShutdownWhileWALBroken.java | 4 +-
.../hbase/regionserver/TestSplitLogWorker.java | 6 +-
.../TestSplitTransactionOnCluster.java | 16 +-
.../hbase/regionserver/TestSplitWalDataLoss.java | 4 +-
.../hbase/regionserver/TestStoreFileInfo.java | 4 +-
.../regionserver/TestStoreFileRefresherChore.java | 6 +-
.../TestStoreFileScannerWithTagCompression.java | 4 +-
.../hbase/regionserver/TestStoreScanner.java | 4 +-
.../regionserver/TestStoreScannerClosure.java | 6 +-
.../regionserver/TestStripeStoreFileManager.java | 4 +-
.../hbase/regionserver/TestSwitchToStreamRead.java | 4 +-
.../apache/hadoop/hbase/regionserver/TestTags.java | 4 +-
.../regionserver/TestTimestampFilterSeekHint.java | 4 +-
.../hadoop/hbase/regionserver/TestWALLockup.java | 6 +-
.../TestWALMonotonicallyIncreasingSeqId.java | 4 +-
.../TestWalAndCompactingMemStoreFlush.java | 14 +-
.../hadoop/hbase/regionserver/TestWideScanner.java | 8 +-
.../compactions/TestCompactedHFilesDischarger.java | 8 +-
.../compactions/TestFIFOCompactionPolicy.java | 8 +-
.../regionserver/compactions/TestOffPeakHours.java | 6 +-
.../TestCompactionWithThroughputController.java | 8 +-
.../TestFlushWithThroughputController.java | 10 +-
.../hbase/regionserver/wal/AbstractTestFSWAL.java | 8 +-
.../wal/AbstractTestLogRollPeriod.java | 4 +-
.../regionserver/wal/AbstractTestLogRolling.java | 12 +-
.../regionserver/wal/AbstractTestProtobufLog.java | 4 +-
.../regionserver/wal/AbstractTestWALReplay.java | 54 ++--
.../regionserver/wal/TestCombinedAsyncWriter.java | 4 +-
.../hbase/regionserver/wal/TestDurability.java | 4 +-
.../hbase/regionserver/wal/TestHBaseWalOnEC.java | 4 +-
.../hbase/regionserver/wal/TestLogRollAbort.java | 8 +-
.../regionserver/wal/TestLogRollingNoCluster.java | 4 +-
.../regionserver/wal/TestWALActionsListener.java | 6 +-
.../regionserver/wal/TestWALConfiguration.java | 4 +-
.../hbase/regionserver/wal/TestWALReplay.java | 4 +-
.../regionserver/wal/WALDurabilityTestBase.java | 10 +-
.../replication/SerialReplicationTestBase.java | 4 +-
.../hbase/replication/SyncReplicationTestBase.java | 40 +--
.../replication/TestHBaseReplicationEndpoint.java | 4 +-
.../hbase/replication/TestMasterReplication.java | 18 +-
.../replication/TestMultiSlaveReplication.java | 22 +-
...TestNamespaceReplicationWithBulkLoadedData.java | 6 +-
.../replication/TestPerTableCFReplication.java | 14 +-
.../hbase/replication/TestReplicationBase.java | 16 +-
.../TestReplicationChangingPeerRegionservers.java | 4 +-
...ReplicationEditsDroppedWithDeletedTableCFs.java | 10 +-
...estReplicationEditsDroppedWithDroppedTable.java | 10 +-
.../hbase/replication/TestReplicationKillRS.java | 6 +-
.../replication/TestReplicationProcedureRetry.java | 4 +-
.../TestReplicationStuckWithDeletedTableCFs.java | 10 +-
.../TestReplicationStuckWithDroppedTable.java | 10 +-
.../replication/TestReplicationSyncUpTool.java | 2 +-
.../replication/TestReplicationSyncUpToolBase.java | 8 +-
...estReplicationSyncUpToolWithBulkLoadedData.java | 2 +-
.../hbase/replication/TestReplicationWithTags.java | 14 +-
.../replication/TestSyncReplicationActive.java | 4 +-
.../TestVerifyCellsReplicationEndpoint.java | 4 +-
.../master/TestRecoverStandbyProcedure.java | 4 +-
.../TestGlobalReplicationThrottler.java | 10 +-
...InterClusterReplicationEndpointFilterEdits.java | 4 +-
.../TestMetaRegionReplicaReplicationEndpoint.java | 22 +-
.../TestRaceWhenCreatingReplicationSource.java | 4 +-
.../TestRegionReplicaReplicationEndpoint.java | 20 +-
...stRegionReplicaReplicationEndpointNoMaster.java | 10 +-
.../regionserver/TestReplicationSink.java | 4 +-
.../regionserver/TestReplicationSource.java | 14 +-
.../regionserver/TestReplicationSourceManager.java | 4 +-
.../TestReplicationSourceManagerZkImpl.java | 4 +-
.../replication/regionserver/TestReplicator.java | 4 +-
.../regionserver/TestSerialReplicationChecker.java | 4 +-
.../TestSerialReplicationEndpoint.java | 4 +-
.../regionserver/WALEntryStreamTestBase.java | 6 +-
.../hbase/rsgroup/EnableRSGroupsTestBase.java | 4 +-
.../rsgroup/TestRSGroupMajorCompactionTTL.java | 8 +-
.../hbase/rsgroup/TestRSGroupMappingScript.java | 4 +-
.../hadoop/hbase/rsgroup/TestRSGroupsBase.java | 14 +-
.../hbase/rsgroup/TestRSGroupsCPHookCalled.java | 4 +-
.../hadoop/hbase/rsgroup/TestRSGroupsFallback.java | 4 +-
.../hbase/rsgroup/TestRSGroupsOfflineMode.java | 29 +-
.../hadoop/hbase/rsgroup/TestRSGroupsWithACL.java | 4 +-
.../hadoop/hbase/security/TestSecureIPC.java | 4 +-
.../TestUsersOperationsWithSecureHadoop.java | 4 +-
.../hbase/security/access/SecureTestUtil.java | 79 ++---
.../security/access/TestAccessControlFilter.java | 6 +-
.../security/access/TestAccessController.java | 8 +-
.../security/access/TestAccessController2.java | 4 +-
.../security/access/TestAccessController3.java | 4 +-
.../access/TestCellACLWithMultipleVersions.java | 4 +-
.../hadoop/hbase/security/access/TestCellACLs.java | 4 +-
.../TestCoprocessorWhitelistMasterObserver.java | 4 +-
.../hbase/security/access/TestHDFSAclHelper.java | 18 +-
.../security/access/TestNamespaceCommands.java | 4 +-
.../hbase/security/access/TestRpcAccessChecks.java | 4 +-
.../security/access/TestScanEarlyTermination.java | 4 +-
.../TestSnapshotScannerHDFSAclController.java | 4 +-
.../TestSnapshotScannerHDFSAclController2.java | 4 +-
.../security/access/TestTablePermissions.java | 4 +-
.../access/TestUnloadAccessController.java | 4 +-
.../access/TestWithDisabledAuthorization.java | 4 +-
.../security/access/TestZKPermissionWatcher.java | 4 +-
.../CustomSaslAuthenticationProviderTestBase.java | 6 +-
.../hbase/security/token/SecureTestCluster.java | 4 +-
.../security/token/TestTokenAuthentication.java | 10 +-
.../hbase/security/token/TestZKSecretWatcher.java | 6 +-
.../token/TestZKSecretWatcherRefreshKeys.java | 6 +-
.../TestDefaultScanLabelGeneratorStack.java | 4 +-
.../TestEnforcingScanLabelGenerator.java | 4 +-
...tVisibilityLabelReplicationWithExpAsString.java | 6 +-
.../security/visibility/TestVisibilityLabels.java | 4 +-
...tVisibilityLabelsOpWithDifferentUsersNoACL.java | 4 +-
.../TestVisibilityLabelsReplication.java | 10 +-
.../visibility/TestVisibilityLabelsWithACL.java | 4 +-
.../TestVisibilityLabelsWithSLGStack.java | 4 +-
.../visibility/TestVisibilityLablesWithGroups.java | 4 +-
.../visibility/TestVisibilityWithCheckAuths.java | 4 +-
.../visibility/TestWithDisabledAuthorization.java | 4 +-
.../VisibilityLabelsWithDeletesTestBase.java | 4 +-
.../hbase/snapshot/MobSnapshotTestingUtils.java | 14 +-
.../hbase/snapshot/SnapshotTestingUtils.java | 26 +-
.../snapshot/TestFlushSnapshotFromClient.java | 6 +-
.../snapshot/TestMobFlushSnapshotFromClient.java | 4 +-
.../TestMobRestoreFlushSnapshotFromClient.java | 4 +-
.../hbase/snapshot/TestRegionSnapshotTask.java | 6 +-
.../TestRestoreFlushSnapshotFromClient.java | 6 +-
.../hbase/snapshot/TestRestoreSnapshotHelper.java | 4 +-
.../hbase/snapshot/TestSnapshotClientRetries.java | 4 +-
.../snapshot/TestSnapshotDescriptionUtils.java | 4 +-
.../hbase/snapshot/TestSnapshotManifest.java | 6 +-
.../hbase/snapshot/TestSnapshotStoreFileSize.java | 4 +-
.../snapshot/TestSnapshotWhenChoreCleaning.java | 4 +-
.../hadoop/hbase/tool/TestBulkLoadHFiles.java | 12 +-
.../tool/TestBulkLoadHFilesSplitRecovery.java | 6 +-
.../apache/hadoop/hbase/tool/TestCanaryTool.java | 6 +-
.../TestSecureBulkLoadHFilesSplitRecovery.java | 4 +-
.../hadoop/hbase/util/BaseTestHBaseFsck.java | 8 +-
.../hadoop/hbase/util/HFileArchiveTestingUtil.java | 4 +-
.../hadoop/hbase/util/MultiThreadedAction.java | 5 +-
.../hbase/util/ProcessBasedLocalHBaseCluster.java | 25 +-
.../apache/hadoop/hbase/util/RestartMetaTest.java | 7 +-
.../hadoop/hbase/util/TestConnectionCache.java | 4 +-
.../hbase/util/TestCoprocessorScanPolicy.java | 8 +-
.../hadoop/hbase/util/TestFSTableDescriptors.java | 4 +-
.../org/apache/hadoop/hbase/util/TestFSUtils.java | 6 +-
.../apache/hadoop/hbase/util/TestFSVisitor.java | 4 +-
.../TestHBaseFsckCleanReplicationBarriers.java | 4 +-
.../hadoop/hbase/util/TestHBaseFsckEncryption.java | 4 +-
.../hbase/util/TestHBaseFsckReplication.java | 4 +-
.../hbase/util/TestMiniClusterLoadSequential.java | 8 +-
.../apache/hadoop/hbase/util/TestRegionMover1.java | 24 +-
.../apache/hadoop/hbase/util/TestRegionMover2.java | 12 +-
.../apache/hadoop/hbase/util/TestRegionMover3.java | 10 +-
.../util/TestRegionMoverWithRSGroupEnable.java | 4 +-
.../hbase/util/TestRegionSplitCalculator.java | 4 +-
.../hadoop/hbase/util/TestRegionSplitter.java | 38 +--
.../compaction/TestMajorCompactionRequest.java | 6 +-
.../hbase/util/compaction/TestMajorCompactor.java | 6 +-
.../util/compaction/TestMajorCompactorTTL.java | 4 +-
.../wal/TestBoundedRegionGroupingStrategy.java | 4 +-
.../apache/hadoop/hbase/wal/TestCompressedWAL.java | 4 +-
.../apache/hadoop/hbase/wal/TestDisabledWAL.java | 4 +-
.../hadoop/hbase/wal/TestFSHLogProvider.java | 4 +-
.../hadoop/hbase/wal/TestReadWriteSeqIdFiles.java | 4 +-
.../org/apache/hadoop/hbase/wal/TestSecureWAL.java | 4 +-
.../hbase/wal/TestSyncReplicationWALProvider.java | 4 +-
.../apache/hadoop/hbase/wal/TestWALFactory.java | 4 +-
.../apache/hadoop/hbase/wal/TestWALFiltering.java | 4 +-
.../apache/hadoop/hbase/wal/TestWALMethods.java | 4 +-
.../hbase/wal/TestWALOpenAfterDNRollingStart.java | 4 +-
.../hadoop/hbase/wal/TestWALReaderOnSecureWAL.java | 4 +-
.../apache/hadoop/hbase/wal/TestWALRootDir.java | 4 +-
.../org/apache/hadoop/hbase/wal/TestWALSplit.java | 4 +-
.../hadoop/hbase/wal/TestWALSplitToHFile.java | 10 +-
.../wal/TestWALSplitWithDeletedTableData.java | 8 +-
.../hadoop/hbase/wal/TestWrongMetaWALFileName.java | 4 +-
...LCorruptionDueToDanglingByteBufferTestBase.java | 4 +-
.../hadoop/hbase/wal/WALPerformanceEvaluation.java | 6 +-
.../hadoop/hbase/zookeeper/TestZooKeeperACL.java | 6 +-
.../shaded/TestShadedHBaseTestingUtility.java | 4 +-
.../hadoop/hbase/client/AbstractTestShell.java | 4 +-
hbase-testing-util/pom.xml | 35 +++
.../java/org/apache/hadoop/hbase/HBaseCluster.java | 3 +
.../hadoop/hbase/HBaseCommonTestingUtility.java | 7 +-
.../apache/hadoop/hbase/HBaseTestingUtility.java | 114 +++++---
.../apache/hadoop/hbase/HBaseZKTestingUtility.java | 4 +-
.../org/apache/hadoop/hbase/MiniHBaseCluster.java | 8 +-
.../hadoop/hbase/StartMiniClusterOption.java | 4 +-
.../hbase/testing/TestingHBaseClusterImpl.java | 8 +-
.../hbase/testing/TestingHBaseClusterOption.java | 6 +-
.../hadoop/hbase/TestHBaseTestingUtilSpinup.java | 3 +-
.../hbase/thrift/HBaseThriftTestingUtility.java | 6 +-
.../hbase/thrift/TestBindExceptionHandling.java | 4 +-
.../apache/hadoop/hbase/thrift/TestCallQueue.java | 4 +-
.../hadoop/hbase/thrift/TestThriftHttpServer.java | 4 +-
.../hadoop/hbase/thrift/TestThriftServer.java | 4 +-
.../hbase/thrift/TestThriftServerCmdLine.java | 8 +-
.../thrift/TestThriftSpnegoHttpFallbackServer.java | 4 +-
.../hbase/thrift/TestThriftSpnegoHttpServer.java | 4 +-
.../hadoop/hbase/thrift2/TestThriftConnection.java | 8 +-
.../thrift2/TestThriftHBaseServiceHandler.java | 4 +-
.../TestThriftHBaseServiceHandlerWithLabels.java | 4 +-
.../TestThriftHBaseServiceHandlerWithReadOnly.java | 4 +-
...TestingUtility.java => HBaseZKTestingUtil.java} | 15 +-
.../hadoop/hbase/zookeeper/TestHQuorumPeer.java | 4 +-
.../hbase/zookeeper/TestReadOnlyZKClient.java | 4 +-
.../hbase/zookeeper/TestRecoverableZooKeeper.java | 4 +-
.../hbase/zookeeper/TestZKLeaderManager.java | 6 +-
.../hadoop/hbase/zookeeper/TestZKMainServer.java | 4 +-
.../apache/hadoop/hbase/zookeeper/TestZKMulti.java | 4 +-
.../hadoop/hbase/zookeeper/TestZKNodeTracker.java | 4 +-
.../apache/hadoop/hbase/zookeeper/TestZKUtil.java | 4 +-
933 files changed, 3465 insertions(+), 3413 deletions(-)
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 9a92e60..a7c7a5e 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
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Get;
@@ -46,8 +46,8 @@ public class TestHelloHBase {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestHelloHBase.class);
- private static final HBaseTestingUtility TEST_UTIL
- = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL
+ = new HBaseTestingUtil();
@BeforeClass
public static void beforeClass() throws Exception {
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 0f0f7d9..0282ff6 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
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Get;
@@ -46,8 +46,8 @@ public class TestHelloHBase {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestHelloHBase.class);
- private static final HBaseTestingUtility TEST_UTIL
- = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL
+ = new HBaseTestingUtil();
@BeforeClass
public static void beforeClass() throws Exception {
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java
index e1bc83c..51a4aa0 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/AsyncFSTestBase.java
@@ -21,7 +21,7 @@ import java.io.File;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hdfs.MiniDFSCluster;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,7 +30,7 @@ public abstract class AsyncFSTestBase {
private static final Logger LOG = LoggerFactory.getLogger(AsyncFSTestBase.class);
- protected static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ protected static final HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
protected static File CLUSTER_TEST_DIR;
@@ -49,7 +49,7 @@ public abstract class AsyncFSTestBase {
// Using randomUUID ensures that multiple clusters can be launched by
// a same test, if it stops & starts them
Path testDir =
- UTIL.getDataTestDir("cluster_" + HBaseCommonTestingUtility.getRandomUUID().toString());
+ UTIL.getDataTestDir("cluster_" + HBaseCommonTestingUtil.getRandomUUID().toString());
CLUSTER_TEST_DIR = new File(testDir.toString()).getAbsoluteFile();
// Have it cleaned up on exit
boolean b = deleteOnExit();
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java
index d2fdf17..48c6a67 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/io/asyncfs/TestLocalAsyncOutput.java
@@ -22,7 +22,7 @@ import java.util.concurrent.ExecutionException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.CommonFSUtils;
@@ -47,7 +47,7 @@ public class TestLocalAsyncOutput {
private static Class<? extends Channel> CHANNEL_CLASS = NioSocketChannel.class;
- private static final HBaseCommonTestingUtility TEST_UTIL = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil TEST_UTIL = new HBaseCommonTestingUtil();
@AfterClass
public static void tearDownAfterClass() throws IOException {
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
index 5d0b2eb..a91c95a 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/security/HBaseKerberosUtils.java
@@ -23,7 +23,7 @@ import java.net.InetAddress;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.hbase.AuthUtil;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.http.ssl.KeyStoreTestUtil;
import org.apache.hadoop.hdfs.DFSConfigKeys;
@@ -159,7 +159,7 @@ public final class HBaseKerberosUtils {
* @param clazz the caller test class.
* @throws Exception if unable to set up SSL configuration
*/
- public static void setSSLConfiguration(HBaseCommonTestingUtility utility, Class<?> clazz)
+ public static void setSSLConfiguration(HBaseCommonTestingUtil utility, Class<?> clazz)
throws Exception {
Configuration conf = utility.getConfiguration();
conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, HttpConfig.Policy.HTTPS_ONLY.name());
diff --git a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java
index 3931dfd..3c58d9c 100644
--- a/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java
+++ b/hbase-asyncfs/src/test/java/org/apache/hadoop/hbase/util/TestRecoverLeaseFSUtils.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hdfs.DistributedFileSystem;
@@ -43,7 +43,7 @@ public class TestRecoverLeaseFSUtils {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestRecoverLeaseFSUtils.class);
- private static final HBaseCommonTestingUtility HTU = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil HTU = new HBaseCommonTestingUtil();
static {
Configuration conf = HTU.getConfiguration();
conf.setInt("hbase.lease.recovery.first.pause", 10);
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java
index bacb2d4..80ffe55 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBase.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.fs.LocatedFileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.TableName;
@@ -78,8 +78,8 @@ import org.slf4j.LoggerFactory;
public class TestBackupBase {
private static final Logger LOG = LoggerFactory.getLogger(TestBackupBase.class);
- protected static HBaseTestingUtility TEST_UTIL;
- protected static HBaseTestingUtility TEST_UTIL2;
+ protected static HBaseTestingUtil TEST_UTIL;
+ protected static HBaseTestingUtil TEST_UTIL2;
protected static Configuration conf1;
protected static Configuration conf2;
@@ -296,7 +296,7 @@ public class TestBackupBase {
if (useSecondCluster) {
conf2 = HBaseConfiguration.create(conf1);
conf2.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");
- TEST_UTIL2 = new HBaseTestingUtility(conf2);
+ TEST_UTIL2 = new HBaseTestingUtil(conf2);
TEST_UTIL2.setZkCluster(TEST_UTIL.getZkCluster());
TEST_UTIL2.startMiniDFSCluster(3);
String root2 = TEST_UTIL2.getConfiguration().get("fs.defaultFS");
@@ -329,7 +329,7 @@ public class TestBackupBase {
*/
@BeforeClass
public static void setUp() throws Exception {
- TEST_UTIL = new HBaseTestingUtility();
+ TEST_UTIL = new HBaseTestingUtil();
conf1 = TEST_UTIL.getConfiguration();
autoRestoreOnFailure = true;
useSecondCluster = false;
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.java
index 0465033..2ab6f55 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.java
@@ -27,7 +27,7 @@ import java.util.Optional;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
@@ -120,7 +120,7 @@ public class TestBackupDeleteWithFailures extends TestBackupBase{
*/
@BeforeClass
public static void setUp() throws Exception {
- TEST_UTIL = new HBaseTestingUtility();
+ TEST_UTIL = new HBaseTestingUtil();
conf1 = TEST_UTIL.getConfiguration();
conf1.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY,
MasterSnapshotObserver.class.getName());
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java
index 1680dc6..8393087 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
import org.apache.hadoop.hbase.client.Connection;
@@ -56,7 +56,7 @@ public class TestBackupHFileCleaner {
HBaseClassTestRule.forClass(TestBackupHFileCleaner.class);
private static final Logger LOG = LoggerFactory.getLogger(TestBackupHFileCleaner.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static Configuration conf = TEST_UTIL.getConfiguration();
private static TableName tableName = TableName.valueOf("backup.hfile.cleaner");
private static String famName = "fam";
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupManager.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupManager.java
index 625fbab..91bd185 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupManager.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupManager.java
@@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicLongArray;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.backup.impl.BackupManager;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -53,9 +53,9 @@ public class TestBackupManager {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestBackupManager.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
protected static Configuration conf = UTIL.getConfiguration();
- protected static MiniHBaseCluster cluster;
+ protected static SingleProcessHBaseCluster cluster;
protected static Connection conn;
protected BackupManager backupManager;
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java
index 450cf2f..b01a136 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java
@@ -38,8 +38,8 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.BackupInfo.BackupState;
import org.apache.hadoop.hbase.backup.impl.BackupManager;
@@ -66,9 +66,9 @@ public class TestBackupSystemTable {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestBackupSystemTable.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
protected static Configuration conf = UTIL.getConfiguration();
- protected static MiniHBaseCluster cluster;
+ protected static SingleProcessHBaseCluster cluster;
protected static Connection conn;
protected BackupSystemTable table;
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java
index 01481a0..fddbec2 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupUtils.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.backup.util.BackupUtils;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.security.UserGroupInformation;
@@ -42,7 +42,7 @@ public class TestBackupUtils {
HBaseClassTestRule.forClass(TestBackupUtils.class);
private static final Logger LOG = LoggerFactory.getLogger(TestBackupUtils.class);
- protected static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static Configuration conf = TEST_UTIL.getConfiguration();
@Test
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java
index 5ed4025..ea552b7 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestIncrementalBackup.java
@@ -23,8 +23,8 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupAdminImpl;
import org.apache.hadoop.hbase.backup.util.BackupUtils;
@@ -103,7 +103,7 @@ public class TestIncrementalBackup extends TestBackupBase {
// #2 - insert some data to table
Table t1 = insertIntoTable(conn, table1, famName, 1, ADD_ROWS);
LOG.debug("writing " + ADD_ROWS + " rows to " + table1);
- Assert.assertEquals(HBaseTestingUtility.countRows(t1),
+ Assert.assertEquals(HBaseTestingUtil.countRows(t1),
NB_ROWS_IN_BATCH + ADD_ROWS + NB_ROWS_FAM3);
LOG.debug("written " + ADD_ROWS + " rows to " + table1);
// additionally, insert rows to MOB cf
@@ -111,7 +111,7 @@ public class TestIncrementalBackup extends TestBackupBase {
insertIntoTable(conn, table1, mobName, 3, NB_ROWS_MOB);
LOG.debug("written " + NB_ROWS_MOB + " rows to " + table1 + " to Mob enabled CF");
t1.close();
- Assert.assertEquals(HBaseTestingUtility.countRows(t1),
+ Assert.assertEquals(HBaseTestingUtil.countRows(t1),
NB_ROWS_IN_BATCH + ADD_ROWS + NB_ROWS_MOB);
Table t2 = conn.getTable(table2);
Put p2;
@@ -120,11 +120,11 @@ public class TestIncrementalBackup extends TestBackupBase {
p2.addColumn(famName, qualName, Bytes.toBytes("val" + i));
t2.put(p2);
}
- Assert.assertEquals(NB_ROWS_IN_BATCH + 5, HBaseTestingUtility.countRows(t2));
+ Assert.assertEquals(NB_ROWS_IN_BATCH + 5, HBaseTestingUtil.countRows(t2));
t2.close();
LOG.debug("written " + 5 + " rows to " + table2);
// split table1
- MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
List<HRegion> regions = cluster.getRegions(table1);
byte[] name = regions.get(0).getRegionInfo().getRegionName();
long startSplitTime = EnvironmentEdgeManager.currentTime();
@@ -184,11 +184,11 @@ public class TestIncrementalBackup extends TestBackupBase {
// #6.2 - checking row count of tables for full restore
Table hTable = conn.getTable(table1_restore);
- Assert.assertEquals(HBaseTestingUtility.countRows(hTable), NB_ROWS_IN_BATCH + NB_ROWS_FAM3);
+ Assert.assertEquals(HBaseTestingUtil.countRows(hTable), NB_ROWS_IN_BATCH + NB_ROWS_FAM3);
hTable.close();
hTable = conn.getTable(table2_restore);
- Assert.assertEquals(NB_ROWS_IN_BATCH, HBaseTestingUtility.countRows(hTable));
+ Assert.assertEquals(NB_ROWS_IN_BATCH, HBaseTestingUtil.countRows(hTable));
hTable.close();
// #7 - restore incremental backup for multiple tables, with overwrite
@@ -213,7 +213,7 @@ public class TestIncrementalBackup extends TestBackupBase {
hTable.close();
hTable = conn.getTable(table2_restore);
- Assert.assertEquals(NB_ROWS_IN_BATCH + 5, HBaseTestingUtility.countRows(hTable));
+ Assert.assertEquals(NB_ROWS_IN_BATCH + 5, HBaseTestingUtil.countRows(hTable));
hTable.close();
admin.close();
}
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java
index 6db6349..4150d3f 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteBackup.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.util.BackupUtils;
@@ -64,7 +64,7 @@ public class TestRemoteBackup extends TestBackupBase {
*/
@BeforeClass
public static void setUp() throws Exception {
- TEST_UTIL = new HBaseTestingUtility();
+ TEST_UTIL = new HBaseTestingUtil();
conf1 = TEST_UTIL.getConfiguration();
conf1.setInt(HConstants.REGION_SERVER_HANDLER_COUNT, 10);
useSecondCluster = true;
diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java
index 9b08d25..8dd4f79 100644
--- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java
+++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestRemoteRestore.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.backup;
import static org.junit.Assert.assertTrue;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.util.BackupUtils;
import org.apache.hadoop.hbase.client.Admin;
@@ -48,7 +48,7 @@ public class TestRemoteRestore extends TestBackupBase {
*/
@BeforeClass
public static void setUp() throws Exception {
- TEST_UTIL = new HBaseTestingUtility();
+ TEST_UTIL = new HBaseTestingUtil();
conf1 = TEST_UTIL.getConfiguration();
useSecondCluster = true;
setUpHelper();
diff --git a/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerPerformanceEvaluation.java b/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerPerformanceEvaluation.java
index 1dd092d..5943313 100644
--- a/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerPerformanceEvaluation.java
+++ b/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/LoadBalancerPerformanceEvaluation.java
@@ -25,8 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
@@ -57,7 +56,7 @@ public class LoadBalancerPerformanceEvaluation extends AbstractHBaseTool {
private static final Logger LOG =
LoggerFactory.getLogger(LoadBalancerPerformanceEvaluation.class.getName());
- protected static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ protected static final HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
private static final int DEFAULT_NUM_REGIONS = 1000000;
private static Option NUM_REGIONS_OPT = new Option("regions", true,
diff --git a/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCost.java b/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCost.java
index cee76db..04e8528 100644
--- a/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCost.java
+++ b/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCost.java
@@ -35,7 +35,7 @@ import java.util.TreeMap;
import java.util.concurrent.ThreadLocalRandom;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.client.RegionInfo;
@@ -61,7 +61,7 @@ public class TestStochasticLoadBalancerHeterogeneousCost extends StochasticBalan
private static final Logger LOG =
LoggerFactory.getLogger(TestStochasticLoadBalancerHeterogeneousCost.class);
private static final double ALLOWED_WINDOW = 1.20;
- private static final HBaseCommonTestingUtility HTU = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil HTU = new HBaseCommonTestingUtil();
private static String RULES_FILE;
@BeforeClass
diff --git a/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCostRules.java b/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCostRules.java
index b7c66ba..11e3f65 100644
--- a/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCostRules.java
+++ b/hbase-balancer/src/test/java/org/apache/hadoop/hbase/master/balancer/TestStochasticLoadBalancerHeterogeneousCostRules.java
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.Collections;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.junit.Before;
@@ -47,7 +47,7 @@ public class TestStochasticLoadBalancerHeterogeneousCostRules extends Stochastic
public TestName name = new TestName();
private HeterogeneousRegionCountCostFunction costFunction;
- private static final HBaseCommonTestingUtility HTU = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil HTU = new HBaseCommonTestingUtil();
/**
* Make a file for rules that is inside a temporary test dir named for the method so it doesn't
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistryHedgedReads.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistryHedgedReads.java
index 40a38c7..d1cd05c 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistryHedgedReads.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistryHedgedReads.java
@@ -32,7 +32,7 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.ipc.RpcClient;
@@ -69,7 +69,7 @@ public class TestMasterRegistryHedgedReads {
private static final Logger LOG = LoggerFactory.getLogger(TestMasterRegistryHedgedReads.class);
- private static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
private static final ExecutorService EXECUTOR =
Executors.newCachedThreadPool(new ThreadFactoryBuilder().setDaemon(true).build());
diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
index 3e03a07..df63523 100644
--- a/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
+++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/filter/TestKeyOnlyFilter.java
@@ -25,7 +25,7 @@ import java.util.Collection;
import org.apache.hadoop.hbase.ByteBufferKeyValue;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.KeyValue.Type;
import org.apache.hadoop.hbase.KeyValueUtil;
@@ -54,7 +54,7 @@ public class TestKeyOnlyFilter {
@Parameters
public static Collection<Object[]> parameters() {
- return HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;
+ return HBaseCommonTestingUtil.BOOLEAN_PARAMETERIZED;
}
@Test
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtil.java
similarity index 88%
copy from hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
copy to hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtil.java
index 487c926..f78e9de 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtility.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/HBaseCommonTestingUtil.java
@@ -33,16 +33,17 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Waiter.Predicate;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Common helpers for testing HBase that do not depend on specific server/etc. things.
- * @see org.apache.hadoop.hbase.HBaseCommonTestingUtility
*/
-@InterfaceAudience.Public
-public class HBaseCommonTestingUtility {
- protected static final Logger LOG = LoggerFactory.getLogger(HBaseCommonTestingUtility.class);
+@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.PHOENIX)
+@InterfaceStability.Evolving
+public class HBaseCommonTestingUtil {
+ protected static final Logger LOG = LoggerFactory.getLogger(HBaseCommonTestingUtil.class);
/**
* Compression algorithms to use in parameterized JUnit 4 tests
@@ -71,11 +72,11 @@ public class HBaseCommonTestingUtility {
protected final Configuration conf;
- public HBaseCommonTestingUtility() {
+ public HBaseCommonTestingUtil() {
this(null);
}
- public HBaseCommonTestingUtility(Configuration conf) {
+ public HBaseCommonTestingUtil(Configuration conf) {
this.conf = (conf == null ? HBaseConfiguration.create() : conf);
}
@@ -105,8 +106,8 @@ public class HBaseCommonTestingUtility {
private File dataTestDir = null;
/**
- * @return Where to write test data on local filesystem, specific to the test. Useful for tests
- * that do not use a cluster. Creates it if it does not exist already.
+ * Returns Where to write test data on local filesystem, specific to the test. Useful for tests
+ * that do not use a cluster. Creates it if it does not exist already.
*/
public Path getDataTestDir() {
if (this.dataTestDir == null) {
@@ -116,9 +117,9 @@ public class HBaseCommonTestingUtility {
}
/**
+ * Returns the path to a subdirectory or file named {code subdirName} under
+ * {@link #getDataTestDir()}. Does *NOT* create the directory or file if it does not exist.
* @param name the name of a subdirectory or file in the test data directory
- * @return Path to a subdirectory or file named {code subdirName} under
- * {@link #getDataTestDir()}. Does *NOT* create the directory or file if it does not exist.
*/
public Path getDataTestDir(final String name) {
return new Path(getDataTestDir(), name);
@@ -150,7 +151,7 @@ public class HBaseCommonTestingUtility {
}
/**
- * @return A dir with a random (uuid) name under the test dir
+ * Returns A dir with a random (uuid) name under the test dir
* @see #getBaseTestDir()
*/
public Path getRandomDir() {
@@ -174,7 +175,7 @@ public class HBaseCommonTestingUtility {
}
/**
- * @return True if we should delete testing dirs on exit.
+ * Returns true if we should delete testing dirs on exit.
*/
boolean deleteOnExit() {
String v = System.getProperty("hbase.testing.preserve.testdir");
@@ -183,7 +184,7 @@ public class HBaseCommonTestingUtility {
}
/**
- * @return True if we removed the test dirs
+ * Returns true if we removed the test dirs
*/
public boolean cleanupTestDir() {
if (deleteDir(this.dataTestDir)) {
@@ -194,10 +195,10 @@ public class HBaseCommonTestingUtility {
}
/**
+ * Returns true if we removed the test dir
* @param subdir Test subdir name.
- * @return True if we removed the test dir
*/
- boolean cleanupTestDir(final String subdir) {
+ public boolean cleanupTestDir(final String subdir) {
if (this.dataTestDir == null) {
return false;
}
@@ -205,10 +206,9 @@ public class HBaseCommonTestingUtility {
}
/**
- * @return Where to write test data on local filesystem; usually
- * {@link #DEFAULT_BASE_TEST_DIRECTORY}
- * Should not be used by the unit tests, hence its's private.
- * Unit test will use a subdirectory of this directory.
+ * Returns Where to write test data on local filesystem; usually
+ * {@link #DEFAULT_BASE_TEST_DIRECTORY} Should not be used by the unit tests, hence its's private.
+ * Unit test will use a subdirectory of this directory.
* @see #setupDataTestDir()
*/
private Path getBaseTestDir() {
@@ -219,8 +219,8 @@ public class HBaseCommonTestingUtility {
}
/**
+ * Returns true if we deleted it.
* @param dir Directory to delete
- * @return True if we deleted it.
*/
boolean deleteDir(final File dir) {
if (dir == null || !dir.exists()) {
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java
index cf97e31..111056a 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestClassFinder.java
@@ -60,7 +60,7 @@ public class TestClassFinder {
private static final Logger LOG = LoggerFactory.getLogger(TestClassFinder.class);
@Rule public TestName name = new TestName();
- private static final HBaseCommonTestingUtility testUtil = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil testUtil = new HBaseCommonTestingUtil();
private static final String BASEPKG = "tfcpkg";
private static final String PREFIX = "Prefix";
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
index 3f0f346..006aa4f 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestHBaseConfiguration.java
@@ -48,7 +48,7 @@ public class TestHBaseConfiguration {
private static final Logger LOG = LoggerFactory.getLogger(TestHBaseConfiguration.class);
- private static HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ private static HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
@AfterClass
public static void tearDown() throws IOException {
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
index 0b22caa..9eaecef 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java
@@ -29,7 +29,7 @@ import java.security.MessageDigest;
import java.util.Properties;
import javax.crypto.spec.SecretKeySpec;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.util.Bytes;
@@ -48,7 +48,7 @@ public class TestKeyStoreKeyProvider {
HBaseClassTestRule.forClass(TestKeyStoreKeyProvider.class);
private static final Logger LOG = LoggerFactory.getLogger(TestKeyStoreKeyProvider.class);
- static final HBaseCommonTestingUtility TEST_UTIL = new HBaseCommonTestingUtility();
+ static final HBaseCommonTestingUtil TEST_UTIL = new HBaseCommonTestingUtil();
static final String ALIAS = "test";
static final String PASSWORD = "password";
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java
index 778828b..4777ee6 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestByteBufferUtils.java
@@ -44,7 +44,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
@@ -76,7 +76,7 @@ public class TestByteBufferUtils {
@Parameterized.Parameters
public static Collection<Object[]> parameters() {
- return HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;
+ return HBaseCommonTestingUtil.BOOLEAN_PARAMETERIZED;
}
private static void setUnsafe(String fieldName, boolean value) throws Exception {
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCommonFSUtils.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCommonFSUtils.java
index 7d433c0..d3c1d25 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCommonFSUtils.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCommonFSUtils.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -46,12 +46,12 @@ public class TestCommonFSUtils {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestCommonFSUtils.class);
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private Configuration conf;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
conf = htu.getConfiguration();
}
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java
index cf90ff3..a3b3be1 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestCoprocessorClassLoader.java
@@ -29,7 +29,7 @@ import java.io.FileOutputStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.io.IOUtils;
@@ -46,7 +46,7 @@ public class TestCoprocessorClassLoader {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestCoprocessorClassLoader.class);
- private static final HBaseCommonTestingUtility TEST_UTIL = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil TEST_UTIL = new HBaseCommonTestingUtil();
private static final Configuration conf = TEST_UTIL.getConfiguration();
static {
TEST_UTIL.getDataTestDir(); // prepare data test dir and hbase local dir
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java
index b859215..2eeb4fa 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestDynamicClassLoader.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.fail;
import java.io.File;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.Before;
@@ -45,7 +45,7 @@ public class TestDynamicClassLoader {
private static final Logger LOG = LoggerFactory.getLogger(TestDynamicClassLoader.class);
- private static final HBaseCommonTestingUtility TEST_UTIL = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil TEST_UTIL = new HBaseCommonTestingUtil();
private Configuration conf;
static {
diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleKdcServerUtil.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleKdcServerUtil.java
index 1ebe82f..2178459 100644
--- a/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleKdcServerUtil.java
+++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/util/TestSimpleKdcServerUtil.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.util;
import java.io.File;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
import org.apache.kerby.kerberos.kerb.KrbException;
@@ -34,7 +34,7 @@ public class TestSimpleKdcServerUtil {
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestSimpleKdcServerUtil.class);
- private static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
/**
* Test we are able to ride over clashing port... BindException.. when starting up a
@@ -46,7 +46,7 @@ public class TestSimpleKdcServerUtil {
try {
File dir = new File(UTIL.getDataTestDir().toString());
kdc = SimpleKdcServerUtil.
- getRunningSimpleKdcServer(dir, HBaseCommonTestingUtility::randomFreePort, true);
+ getRunningSimpleKdcServer(dir, HBaseCommonTestingUtil::randomFreePort, true);
kdc.createPrincipal("wah");
} finally {
kdc.stop();
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAggregationClient.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAggregationClient.java
index d50ceb9..e2f0360 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAggregationClient.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAggregationClient.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
import java.util.stream.LongStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.coprocessor.AsyncAggregationClient;
import org.apache.hadoop.hbase.client.coprocessor.LongColumnInterpreter;
@@ -46,7 +46,7 @@ public class TestAsyncAggregationClient {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncAggregationClient.class);
- private static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("TestAsyncAggregationClient");
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
index 80a3766..587fd70 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.apache.hadoop.hbase.HBaseTestingUtility.fam1;
+import static org.apache.hadoop.hbase.HBaseTestingUtil.fam1;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -29,7 +29,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellScannable;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Scan.ReadType;
@@ -99,7 +99,7 @@ public class TestRpcControllerFactory {
}
}
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
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 caf4e34..67e4ff1 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
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.TreeMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -80,7 +80,7 @@ public class TestBatchCoprocessorEndpoint {
private static final int rowSeperator2 = 12;
private static byte[][] ROWS = makeN(ROW, ROWSIZE);
- private static HBaseTestingUtility util = new HBaseTestingUtility();
+ private static HBaseTestingUtil util = new HBaseTestingUtil();
@BeforeClass
public static void setupBeforeClass() throws Exception {
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 0fa3b74..705bf62 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
@@ -37,11 +37,11 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.RegionMetrics;
import org.apache.hadoop.hbase.ServerMetrics;
import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -76,7 +76,7 @@ public class TestClassLoading {
HBaseClassTestRule.forClass(TestClassLoading.class);
private static final Logger LOG = LoggerFactory.getLogger(TestClassLoading.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
public static class TestMasterCoprocessor implements MasterCoprocessor, MasterObserver {
@Override
@@ -199,7 +199,7 @@ public class TestClassLoading {
boolean foundTableRegion=false;
boolean found1 = true, found2 = true, found2_k1 = true, found2_k2 = true, found2_k3 = true;
Map<Region, Set<ClassLoader>> regionsActiveClassLoaders = new HashMap<>();
- MiniHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
for (HRegion region:
hbase.getRegionServer(0).getOnlineRegionsLocalContext()) {
if (region.getRegionInfo().getRegionNameAsString().startsWith(tableName.getNameAsString())) {
@@ -272,7 +272,7 @@ public class TestClassLoading {
// verify that the coprocessor was loaded
boolean found = false;
- MiniHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
for (HRegion region: hbase.getRegionServer(0).getOnlineRegionsLocalContext()) {
if (region.getRegionInfo().getRegionNameAsString().startsWith(cpName3)) {
found = (region.getCoprocessorHost().findCoprocessor(cpName3) != null);
@@ -299,7 +299,7 @@ public class TestClassLoading {
// verify that the coprocessor was loaded correctly
boolean found = false;
- MiniHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
for (HRegion region: hbase.getRegionServer(0).getOnlineRegionsLocalContext()) {
if (region.getRegionInfo().getRegionNameAsString().startsWith(cpName4)) {
Coprocessor cp = region.getCoprocessorHost().findCoprocessor(cpName4);
@@ -384,7 +384,7 @@ public class TestClassLoading {
boolean found6_k1 = false, found6_k2 = false, found6_k3 = false,
found6_k4 = false;
- MiniHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
for (HRegion region: hbase.getRegionServer(0).getOnlineRegionsLocalContext()) {
if (region.getRegionInfo().getRegionNameAsString().startsWith(tableName.getNameAsString())) {
found_1 = found_1 ||
@@ -475,7 +475,7 @@ public class TestClassLoading {
// verify that the coprocessors were loaded
boolean found1 = false, found2 = false, found2_k1 = false,
found2_k2 = false, found2_k3 = false;
- MiniHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster hbase = TEST_UTIL.getHBaseCluster();
for (HRegion region: hbase.getRegionServer(0).getOnlineRegionsLocalContext()) {
if (region.getRegionInfo().getRegionNameAsString().startsWith(tableName.getNameAsString())) {
CoprocessorEnvironment env;
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 a0b100f..d6d0d4c 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
@@ -30,7 +30,7 @@ import java.util.Map;
import java.util.TreeMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
@@ -87,7 +87,7 @@ public class TestCoprocessorEndpoint {
private static final int rowSeperator2 = 12;
private static byte[][] ROWS = makeN(ROW, ROWSIZE);
- private static HBaseTestingUtility util = new HBaseTestingUtility();
+ private static HBaseTestingUtil util = new HBaseTestingUtil();
@BeforeClass
public static void setupBeforeClass() throws Exception {
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 9704404..5a0827c 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
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.Map;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -62,7 +62,7 @@ public class TestCoprocessorTableEndpoint {
private static final int rowSeperator2 = 12;
private static final byte[][] ROWS = makeN(ROW, ROWSIZE);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
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 14e663a..81b14b94 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
@@ -24,7 +24,7 @@ import java.io.FileNotFoundException;
import java.util.Collections;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils;
import org.apache.hadoop.hbase.ipc.ServerRpcController;
@@ -54,13 +54,13 @@ public class TestRegionServerCoprocessorEndpoint {
HBaseClassTestRule.forClass(TestRegionServerCoprocessorEndpoint.class);
public static final FileNotFoundException WHAT_TO_THROW = new FileNotFoundException("/file.txt");
- private static HBaseTestingUtility TEST_UTIL = null;
+ private static HBaseTestingUtil TEST_UTIL = null;
private static Configuration CONF = null;
private static final String DUMMY_VALUE = "val";
@BeforeClass
public static void setupBeforeClass() throws Exception {
- TEST_UTIL = new HBaseTestingUtility();
+ TEST_UTIL = new HBaseTestingUtil();
CONF = TEST_UTIL.getConfiguration();
CONF.setStrings(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY,
DummyRegionServerEndpoint.class.getName());
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestSecureExport.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestSecureExport.java
index ee52433..a13cb5b 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestSecureExport.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/coprocessor/TestSecureExport.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.Connection;
@@ -91,7 +91,7 @@ public class TestSecureExport {
HBaseClassTestRule.forClass(TestSecureExport.class);
private static final Logger LOG = LoggerFactory.getLogger(TestSecureExport.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static MiniKdc KDC;
private static final File KEYTAB_FILE = new File(UTIL.getDataTestDir("keytab").toUri().getPath());
private static String USERNAME;
diff --git a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java
index 22d3f13..fca2075 100644
--- a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java
+++ b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/regionserver/TestServerCustomProtocol.java
@@ -26,7 +26,7 @@ import java.util.Collections;
import java.util.Map;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
@@ -150,7 +150,7 @@ public class TestServerCustomProtocol {
private static final byte[] ROW_AB = Bytes.toBytes("abb");
private static final byte[] ROW_BC = Bytes.toBytes("bcc");
- private static HBaseTestingUtility util = new HBaseTestingUtility();
+ private static HBaseTestingUtil util = new HBaseTestingUtil();
@BeforeClass
public static void setupBeforeClass() throws Exception {
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestAsyncClientExample.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestAsyncClientExample.java
index bee18dd..0256449 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestAsyncClientExample.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestAsyncClientExample.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client.example;
import static org.junit.Assert.assertEquals;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -39,7 +39,7 @@ public class TestAsyncClientExample {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncClientExample.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName TABLE_NAME = TableName.valueOf("test");
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestHttpProxyExample.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestHttpProxyExample.java
index 531f818..d7925ef 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestHttpProxyExample.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestHttpProxyExample.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import java.nio.charset.StandardCharsets;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -49,7 +49,7 @@ public class TestHttpProxyExample {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestHttpProxyExample.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName TABLE_NAME = TableName.valueOf("test");
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesBase.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesBase.java
index e8cab77..f56d514 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesBase.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesBase.java
@@ -20,9 +20,9 @@ package org.apache.hadoop.hbase.coprocessor.example;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
@@ -37,7 +37,7 @@ import org.slf4j.LoggerFactory;
public class TestRefreshHFilesBase {
protected static final Logger LOG = LoggerFactory.getLogger(TestRefreshHFilesBase.class);
- protected static final HBaseTestingUtility HTU = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil HTU = new HBaseTestingUtil();
protected static final int NUM_RS = 2;
protected static final TableName TABLE_NAME = TableName.valueOf("testRefreshRegionHFilesEP");
protected static final byte[] FAMILY = Bytes.toBytes("family");
@@ -47,7 +47,7 @@ public class TestRefreshHFilesBase {
protected static final String HFILE_NAME = "123abcdef";
protected static Configuration CONF = HTU.getConfiguration();
- protected static MiniHBaseCluster cluster;
+ protected static SingleProcessHBaseCluster cluster;
protected static Table table;
public static void setUp(String regionImpl) {
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestScanModifyingObserver.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestScanModifyingObserver.java
index 76d9cb9..8938724 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestScanModifyingObserver.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestScanModifyingObserver.java
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -52,7 +52,7 @@ public class TestScanModifyingObserver {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestScanModifyingObserver.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName NAME = TableName.valueOf("TestScanModifications");
private static final byte[] FAMILY = Bytes.toBytes("f");
private static final ColumnFamilyDescriptor CFD = ColumnFamilyDescriptorBuilder
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestValueReplacingCompaction.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestValueReplacingCompaction.java
index 6974c20..872b476 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestValueReplacingCompaction.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestValueReplacingCompaction.java
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -52,7 +52,7 @@ public class TestValueReplacingCompaction {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestValueReplacingCompaction.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName NAME = TableName.valueOf("TestValueReplacement");
private static final byte[] FAMILY = Bytes.toBytes("f");
private static final byte[] QUALIFIER = Bytes.toBytes("q");
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java
index 5705c99..238eb0a 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertFalse;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.Get;
@@ -50,7 +50,7 @@ public class TestZooKeeperScanPolicyObserver {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestZooKeeperScanPolicyObserver.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName NAME = TableName.valueOf("TestCP");
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserverTestBase.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserverTestBase.java
index f9a5b5b..3966adc 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserverTestBase.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserverTestBase.java
@@ -22,8 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.io.UncheckedIOException;
import java.util.stream.IntStream;
-
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Get;
@@ -37,7 +36,7 @@ import org.junit.BeforeClass;
public class WriteHeavyIncrementObserverTestBase {
- protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
protected static TableName NAME = TableName.valueOf("TestCP");
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java
index 43dba2c..616cb2f 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMapReduceExamples.java
@@ -30,7 +30,7 @@ import java.io.PrintStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
@@ -58,7 +58,7 @@ public class TestMapReduceExamples {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestMapReduceExamples.class);
- private static HBaseTestingUtility util = new HBaseTestingUtility();
+ private static HBaseTestingUtil util = new HBaseTestingUtil();
/**
* Test SampleUploader from examples
diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/security/provider/example/TestShadeSaslAuthenticationProvider.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/security/provider/example/TestShadeSaslAuthenticationProvider.java
index 05a8071..34cdf65 100644
--- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/security/provider/example/TestShadeSaslAuthenticationProvider.java
+++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/security/provider/example/TestShadeSaslAuthenticationProvider.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.LocalHBaseCluster;
import org.apache.hadoop.hbase.TableName;
@@ -96,7 +96,7 @@ public class TestShadeSaslAuthenticationProvider {
private static final char[] USER1_PASSWORD = "foobarbaz".toCharArray();
- static LocalHBaseCluster createCluster(HBaseTestingUtility util, File keytabFile,
+ static LocalHBaseCluster createCluster(HBaseTestingUtil util, File keytabFile,
MiniKdc kdc, Map<String,char[]> userDatabase) throws Exception {
String servicePrincipal = "hbase/localhost";
String spnegoPrincipal = "HTTP/localhost";
@@ -140,7 +140,7 @@ public class TestShadeSaslAuthenticationProvider {
}
}
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final Configuration CONF = UTIL.getConfiguration();
private static LocalHBaseCluster CLUSTER;
private static File KEYTAB_FILE;
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestProxyUserSpnegoHttpServer.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestProxyUserSpnegoHttpServer.java
index ed98a2f..e4ecaed 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestProxyUserSpnegoHttpServer.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestProxyUserSpnegoHttpServer.java
@@ -29,7 +29,7 @@ import javax.security.auth.kerberos.KerberosTicket;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.http.TestHttpServer.EchoServlet;
import org.apache.hadoop.hbase.http.resource.JerseyResource;
import org.apache.hadoop.hbase.testclassification.MiscTests;
@@ -98,12 +98,12 @@ public class TestProxyUserSpnegoHttpServer extends HttpServerFunctionalTest {
@BeforeClass
public static void setupServer() throws Exception {
Configuration conf = new Configuration();
- HBaseCommonTestingUtility htu = new HBaseCommonTestingUtility(conf);
+ HBaseCommonTestingUtil htu = new HBaseCommonTestingUtil(conf);
final String serverPrincipal = "HTTP/" + KDC_SERVER_HOST;
kdc = SimpleKdcServerUtil.getRunningSimpleKdcServer(new File(htu.getDataTestDir().toString()),
- HBaseCommonTestingUtility::randomFreePort);
+ HBaseCommonTestingUtil::randomFreePort);
File keytabDir = new File(htu.getDataTestDir("keytabs").toString());
if (keytabDir.exists()) {
deleteRecursively(keytabDir);
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java
index 91540c5..7a314ac 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSSLHttpServer.java
@@ -26,7 +26,7 @@ import javax.net.ssl.HttpsURLConnection;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.http.ssl.KeyStoreTestUtil;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -64,12 +64,12 @@ public class TestSSLHttpServer extends HttpServerFunctionalTest {
private static File keystoresDir;
private static String sslConfDir;
private static SSLFactory clientSslFactory;
- private static HBaseCommonTestingUtility HTU;
+ private static HBaseCommonTestingUtil HTU;
@BeforeClass
public static void setup() throws Exception {
- HTU = new HBaseCommonTestingUtility();
+ HTU = new HBaseCommonTestingUtil();
serverConf = HTU.getConfiguration();
serverConf.setInt(HttpServer.HTTP_MAX_THREADS, TestHttpServer.MAX_THREADS);
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java
index 28e4fcf..eb33943 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/TestSpnegoHttpServer.java
@@ -28,7 +28,7 @@ import javax.security.auth.Subject;
import javax.security.auth.kerberos.KerberosTicket;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.http.TestHttpServer.EchoServlet;
import org.apache.hadoop.hbase.http.resource.JerseyResource;
import org.apache.hadoop.hbase.testclassification.MiscTests;
@@ -88,12 +88,12 @@ public class TestSpnegoHttpServer extends HttpServerFunctionalTest {
@BeforeClass
public static void setupServer() throws Exception {
Configuration conf = new Configuration();
- HBaseCommonTestingUtility htu = new HBaseCommonTestingUtility(conf);
+ HBaseCommonTestingUtil htu = new HBaseCommonTestingUtil(conf);
final String serverPrincipal = "HTTP/" + KDC_SERVER_HOST;
kdc = SimpleKdcServerUtil.getRunningSimpleKdcServer(new File(htu.getDataTestDir().toString()),
- HBaseCommonTestingUtility::randomFreePort);
+ HBaseCommonTestingUtil::randomFreePort);
File keytabDir = new File(htu.getDataTestDir("keytabs").toString());
if (keytabDir.exists()) {
deleteRecursively(keytabDir);
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
index 4b8bb6b..421cbbd 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/log/TestLogLevel.java
@@ -37,7 +37,7 @@ import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.http.HttpConfig;
import org.apache.hadoop.hbase.http.HttpServer;
import org.apache.hadoop.hbase.http.log.LogLevel.CLI;
@@ -83,13 +83,13 @@ public class TestLogLevel {
private static final String LOCALHOST = "localhost";
private static final String clientPrincipal = "client/" + LOCALHOST;
private static String HTTP_PRINCIPAL = "HTTP/" + LOCALHOST;
- private static HBaseCommonTestingUtility HTU;
+ private static HBaseCommonTestingUtil HTU;
private static File keyTabFile;
@BeforeClass
public static void setUp() throws Exception {
serverConf = new Configuration();
- HTU = new HBaseCommonTestingUtility(serverConf);
+ HTU = new HBaseCommonTestingUtil(serverConf);
File keystoreDir = new File(HTU.getDataTestDir("keystore").toString());
keystoreDir.mkdirs();
diff --git a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/ssl/KeyStoreTestUtil.java b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/ssl/KeyStoreTestUtil.java
index c201c7a..e09f642 100644
--- a/hbase-http/src/test/java/org/apache/hadoop/hbase/http/ssl/KeyStoreTestUtil.java
+++ b/hbase-http/src/test/java/org/apache/hadoop/hbase/http/ssl/KeyStoreTestUtil.java
@@ -43,7 +43,7 @@ import java.util.HashMap;
import java.util.Map;
import javax.security.auth.x500.X500Principal;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.security.ssl.FileBasedKeyStoresFactory;
import org.apache.hadoop.security.ssl.SSLFactory;
import org.bouncycastle.x509.X509V1CertificateGenerator;
@@ -281,10 +281,10 @@ public final class KeyStoreTestUtil {
String trustPassword = "trustP";
File sslClientConfFile = new File(
- sslConfDir + "/ssl-client-" + System.nanoTime() + "-" + HBaseCommonTestingUtility
+ sslConfDir + "/ssl-client-" + System.nanoTime() + "-" + HBaseCommonTestingUtil
.getRandomUUID() + ".xml");
File sslServerConfFile = new File(
- sslConfDir + "/ssl-server-" + System.nanoTime() + "-" + HBaseCommonTestingUtility
+ sslConfDir + "/ssl-server-" + System.nanoTime() + "-" + HBaseCommonTestingUtil
.getRandomUUID() + ".xml");
Map<String, X509Certificate> certs = new HashMap<>();
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
index d4fa6ed..9fb7db9 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/DistributedHBaseCluster.java
@@ -37,13 +37,18 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
- * Manages the interactions with an already deployed distributed cluster (as opposed to
- * a pseudo-distributed, or mini/local cluster). This is used by integration and system tests.
+ * Manages the interactions with an already deployed distributed cluster (as opposed to a
+ * pseudo-distributed, or mini/local cluster). This is used by integration and system tests.
*/
@InterfaceAudience.Private
-public class DistributedHBaseCluster extends HBaseCluster {
+public class DistributedHBaseCluster extends HBaseClusterInterface {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DistributedHBaseCluster.class);
+
private Admin admin;
private final Connection connection;
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
index e399d81..f57b9b6 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestBackupRestore.java
@@ -217,7 +217,7 @@ public class IntegrationTestBackupRestore extends IntegrationTestBase {
LOG.info("Creating table {} with {} splits.", tableName,
regionsCountPerServer * regionServerCount);
startTime = EnvironmentEdgeManager.currentTime();
- HBaseTestingUtility.createPreSplitLoadTestTable(util.getConfiguration(), desc, columns,
+ HBaseTestingUtil.createPreSplitLoadTestTable(util.getConfiguration(), desc, columns,
regionsCountPerServer);
util.waitTableAvailable(tableName);
endTime = EnvironmentEdgeManager.currentTime();
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
index 61d0e7e..b2d90f1 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
@@ -114,7 +114,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
protected static final int DEFAULT_NUM_REGIONS = 50; // number of regions in pre-split tables
private boolean keepObjectsAtTheEnd = false;
- protected HBaseCluster cluster;
+ protected HBaseClusterInterface cluster;
protected Connection connection;
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 c5bdc51..6f440f5 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
@@ -64,7 +64,7 @@ public class IntegrationTestIngest extends IntegrationTestBase {
// Log is being used in IntegrationTestIngestWithEncryption, hence it is protected
protected static final Logger LOG = LoggerFactory.getLogger(IntegrationTestIngest.class);
protected IntegrationTestingUtility util;
- protected HBaseCluster cluster;
+ protected HBaseClusterInterface cluster;
protected LoadTestTool loadTool;
protected String[] LOAD_TEST_TOOL_INIT_ARGS = {
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java
index 0d511c9..4610678 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestStripeCompactions.java
@@ -46,7 +46,7 @@ public class IntegrationTestIngestStripeCompactions extends IntegrationTestInges
.setValue(HStore.BLOCKING_STOREFILES_KEY, "100").build();
ColumnFamilyDescriptor familyDescriptor =
ColumnFamilyDescriptorBuilder.of(HFileTestUtil.DEFAULT_COLUMN_FAMILY);
- HBaseTestingUtility.createPreSplitLoadTestTable(util.getConfiguration(),
+ HBaseTestingUtil.createPreSplitLoadTestTable(util.getConfiguration(),
tableDescriptor, familyDescriptor);
}
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java
index 05e2036..b76145a 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java
@@ -57,7 +57,7 @@ public class IntegrationTestMetaReplicas {
StorefileRefresherChore.REGIONSERVER_STOREFILE_REFRESH_PERIOD, 1000);
// Make sure there are three servers.
util.initializeCluster(3);
- HBaseTestingUtility.setReplicas(util.getAdmin(), TableName.META_TABLE_NAME, 3);
+ HBaseTestingUtil.setReplicas(util.getAdmin(), TableName.META_TABLE_NAME, 3);
ZKWatcher zkw = util.getZooKeeperWatcher();
Configuration conf = util.getConfiguration();
String baseZNode = conf.get(HConstants.ZOOKEEPER_ZNODE_PARENT,
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 43749d1..8c43176 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
@@ -23,7 +23,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.util.ReflectionUtils;
/**
- * Facility for <strong>integration/system</strong> tests. This extends {@link HBaseTestingUtility}
+ * Facility for <strong>integration/system</strong> tests. This extends {@link HBaseTestingUtil}
* and adds-in the functionality needed by integration and system tests. This class understands
* distributed and pseudo-distributed/local cluster deployments, and abstracts those from the tests
* in this module.
@@ -39,7 +39,7 @@ import org.apache.hadoop.util.ReflectionUtils;
* via {@link #initializeCluster(int)}. Individual tests should not directly call
* {@link #setUseDistributedCluster(Configuration)}.
*/
-public class IntegrationTestingUtility extends HBaseTestingUtility {
+public class IntegrationTestingUtility extends HBaseTestingUtil {
public IntegrationTestingUtility() {
this(HBaseConfiguration.create());
@@ -84,7 +84,7 @@ public class IntegrationTestingUtility extends HBaseTestingUtility {
* exception otherwise.
*/
public void checkNodeCount(int numSlaves) throws Exception {
- HBaseCluster cluster = getHBaseClusterInterface();
+ HBaseClusterInterface cluster = getHBaseClusterInterface();
if (cluster.getClusterMetrics().getLiveServerMetrics().size() < numSlaves) {
throw new Exception("Cluster does not have enough nodes:" + numSlaves);
}
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 5eaa096..22c71c5 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
@@ -296,7 +296,7 @@ public class StripeCompactionsPerformanceEvaluation extends AbstractHBaseTool {
private void createTable(TableDescriptorBuilder builder)
throws Exception {
deleteTable();
- if (util.getHBaseClusterInterface() instanceof MiniHBaseCluster) {
+ if (util.getHBaseClusterInterface() instanceof SingleProcessHBaseCluster) {
LOG.warn("Test does not make a lot of sense for minicluster. Will set flush size low.");
builder.setValue(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, "1048576");
}
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/TestRESTApiClusterManager.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/TestRESTApiClusterManager.java
index 4081e47..d7c18f1 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/TestRESTApiClusterManager.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/TestRESTApiClusterManager.java
@@ -46,12 +46,12 @@ public class TestRESTApiClusterManager {
@Rule
public final TestName testName = new TestName();
- private static HBaseCommonTestingUtility testingUtility;
+ private static HBaseCommonTestingUtil testingUtility;
private ClusterManager clusterManager;
@BeforeClass
public static void beforeClass() {
- testingUtility = new HBaseCommonTestingUtility();
+ testingUtility = new HBaseCommonTestingUtil();
configureClusterManager(testingUtility.getConfiguration());
}
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/TestShellExecEndpointCoprocessor.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/TestShellExecEndpointCoprocessor.java
index 81519bc..4d9cd7e 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/TestShellExecEndpointCoprocessor.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/TestShellExecEndpointCoprocessor.java
@@ -116,10 +116,10 @@ public class TestShellExecEndpointCoprocessor {
}
private static File ensureTestDataDirExists(
- final HBaseTestingUtility testingUtility
+ final HBaseTestingUtil testingUtility
) throws IOException {
final Path testDataDir = Optional.of(testingUtility)
- .map(HBaseTestingUtility::getDataTestDir)
+ .map(HBaseTestingUtil::getDataTestDir)
.map(Object::toString)
.map(val -> Paths.get(val))
.orElseThrow(() -> new RuntimeException("Unable to locate temp directory path."));
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 9a2b048..a4209a9 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
@@ -32,13 +32,13 @@ import java.util.function.Consumer;
import org.apache.commons.lang3.RandomUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ClusterMetrics;
-import org.apache.hadoop.hbase.HBaseCluster;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseClusterInterface;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.IntegrationTestBase;
import org.apache.hadoop.hbase.IntegrationTestingUtility;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.ServerMetrics;
import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.chaos.factories.MonkeyConstants;
import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey;
@@ -87,7 +87,7 @@ public abstract class Action {
protected static final long START_NAMENODE_TIMEOUT_DEFAULT = PolicyBasedChaosMonkey.TIMEOUT;
protected ActionContext context;
- protected HBaseCluster cluster;
+ protected HBaseClusterInterface cluster;
protected ClusterMetrics initialStatus;
protected ServerName[] initialServers;
protected Properties monkeyProps;
@@ -197,7 +197,7 @@ public abstract class Action {
protected void suspendRs(ServerName server) throws IOException {
getLogger().info("Suspending regionserver {}", server);
cluster.suspendRegionServer(server);
- if(!(cluster instanceof MiniHBaseCluster)){
+ if(!(cluster instanceof SingleProcessHBaseCluster)){
cluster.waitForRegionServerToStop(server, killRsTimeout);
}
getLogger().info("Suspending regionserver {}. Reported num of rs:{}", server,
@@ -207,7 +207,7 @@ public abstract class Action {
protected void resumeRs(ServerName server) throws IOException {
getLogger().info("Resuming regionserver {}", server);
cluster.resumeRegionServer(server);
- if(!(cluster instanceof MiniHBaseCluster)){
+ if(!(cluster instanceof SingleProcessHBaseCluster)){
cluster.waitForRegionServerToStart(server.getHostname(), server.getPort(), startRsTimeout);
}
getLogger().info("Resuming regionserver {}. Reported num of rs:{}", server,
@@ -342,7 +342,7 @@ public abstract class Action {
*/
protected void modifyAllTableColumns(TableName tableName,
BiConsumer<String, ColumnFamilyDescriptorBuilder> transform) throws IOException {
- HBaseTestingUtility util = this.context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = this.context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
TableDescriptor tableDescriptor = admin.getDescriptor(tableName);
@@ -401,7 +401,7 @@ public abstract class Action {
return util;
}
- public HBaseCluster getHBaseCluster() {
+ public HBaseClusterInterface getHBaseCluster() {
return util.getHBaseClusterInterface();
}
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 14a11ee..63553a7 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
@@ -18,7 +18,7 @@
package org.apache.hadoop.hbase.chaos.actions;
import java.util.Random;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.TableDescriptor;
@@ -51,7 +51,7 @@ public class ChangeSplitPolicyAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
getLogger().info("Performing action: Change split policy of table " + tableName);
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 889b3fb..fe5f5e9 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
@@ -19,7 +19,7 @@
package org.apache.hadoop.hbase.chaos.actions;
import org.apache.commons.lang3.RandomUtils;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.CompactType;
@@ -52,7 +52,7 @@ public class CompactMobAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
boolean major = RandomUtils.nextInt(0, 100) < majorRatio;
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 ffc05b8..9ed876d 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
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.chaos.actions;
import java.util.List;
import org.apache.commons.lang3.RandomUtils;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey;
import org.apache.hadoop.hbase.client.Admin;
@@ -56,7 +56,7 @@ public class CompactRandomRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
boolean major = RandomUtils.nextInt(0, 100) < majorRatio;
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 7278d2b..7d57b3b 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
@@ -19,7 +19,7 @@
package org.apache.hadoop.hbase.chaos.actions;
import org.apache.commons.lang3.RandomUtils;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.slf4j.Logger;
@@ -52,7 +52,7 @@ public class CompactTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
boolean major = RandomUtils.nextInt(0, 100) < majorRatio;
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 ff23c34..dab0475 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
@@ -19,7 +19,7 @@
package org.apache.hadoop.hbase.chaos.actions;
import java.util.List;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey;
import org.apache.hadoop.hbase.client.Admin;
@@ -51,7 +51,7 @@ public class FlushRandomRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
getLogger().info("Performing action: Flush random region of table " + tableName);
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 d73b85a..6951748 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
@@ -18,7 +18,7 @@
package org.apache.hadoop.hbase.chaos.actions;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.slf4j.Logger;
@@ -47,7 +47,7 @@ public class FlushTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
// Don't try the flush if we're stopping
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 a7e0723..2e359ed 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
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.chaos.actions;
import java.util.List;
import org.apache.commons.lang3.RandomUtils;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.RegionInfo;
@@ -51,7 +51,7 @@ public class MergeRandomAdjacentRegionsOfTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
getLogger().info("Performing action: Merge random adjacent regions of table " + tableName);
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 2e9b3b9..d2d51ed 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
@@ -19,7 +19,7 @@
package org.apache.hadoop.hbase.chaos.actions;
import java.util.List;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey;
import org.apache.hadoop.hbase.client.Admin;
@@ -54,7 +54,7 @@ public class MoveRandomRegionOfTableAction extends Action {
Thread.sleep(sleepTime);
}
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
getLogger().info("Performing action: Move random region of table " + tableName);
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 2f39233..b2297f7 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
@@ -18,7 +18,7 @@
package org.apache.hadoop.hbase.chaos.actions;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -48,7 +48,7 @@ public class SnapshotTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
String snapshotName = tableName + "-it-" + EnvironmentEdgeManager.currentTime();
Admin admin = util.getAdmin();
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 ffd841b..dd4e993 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
@@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.chaos.actions;
import java.io.IOException;
import java.util.concurrent.ThreadLocalRandom;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.slf4j.Logger;
@@ -51,7 +51,7 @@ public class SplitAllRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
// Don't try the split if we're stopping
if (context.isStopping()) {
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 3a68339..1a60ffc 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
@@ -19,7 +19,7 @@
package org.apache.hadoop.hbase.chaos.actions;
import java.util.List;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey;
import org.apache.hadoop.hbase.client.Admin;
@@ -51,7 +51,7 @@ public class SplitRandomRegionOfTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
getLogger().info("Performing action: Split random region of table " + tableName);
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SudoCommandAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SudoCommandAction.java
index f1712c8..8766f4d 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SudoCommandAction.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/SudoCommandAction.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.chaos.actions;
import java.io.IOException;
import org.apache.hadoop.hbase.DistributedHBaseCluster;
-import org.apache.hadoop.hbase.HBaseCluster;
+import org.apache.hadoop.hbase.HBaseClusterInterface;
import org.apache.hadoop.hbase.HBaseClusterManager;
/**
@@ -38,7 +38,7 @@ abstract public class SudoCommandAction extends Action {
@Override
public void init(ActionContext context) throws IOException {
super.init(context);
- HBaseCluster cluster = context.getHBaseCluster();
+ HBaseClusterInterface cluster = context.getHBaseCluster();
if (cluster instanceof DistributedHBaseCluster){
Object manager = ((DistributedHBaseCluster)cluster).getClusterManager();
if (manager instanceof HBaseClusterManager){
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 5da10c7..381de95 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
@@ -19,7 +19,7 @@
package org.apache.hadoop.hbase.chaos.actions;
import java.util.Random;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.slf4j.Logger;
@@ -44,7 +44,7 @@ public class TruncateTableAction extends Action {
@Override
public void perform() throws Exception {
- HBaseTestingUtility util = context.getHBaseIntegrationTestingUtility();
+ HBaseTestingUtil util = context.getHBaseIntegrationTestingUtility();
Admin admin = util.getAdmin();
// Don't try the truncate if we're stopping
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 578df72..547753c 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
@@ -36,7 +36,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.IntegrationTestBase;
import org.apache.hadoop.hbase.IntegrationTestingUtility;
import org.apache.hadoop.hbase.KeyValue;
@@ -211,7 +211,7 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
TableDescriptor desc = admin.getDescriptor(t);
TableDescriptorBuilder builder = TableDescriptorBuilder.newBuilder(desc);
builder.setCoprocessor(SlowMeCoproScanOperations.class.getName());
- HBaseTestingUtility.modifyTableSync(admin, builder.build());
+ HBaseTestingUtil.modifyTableSync(admin, builder.build());
}
@Test
@@ -252,7 +252,7 @@ public class IntegrationTestBulkLoad extends IntegrationTestBase {
if (replicaCount == NUM_REPLICA_COUNT_DEFAULT) return;
TableName t = getTablename();
- HBaseTestingUtility.setReplicas(util.getAdmin(), t, replicaCount);
+ HBaseTestingUtil.setReplicas(util.getAdmin(), t, replicaCount);
}
private void runLinkedListMRJob(int iteration) throws Exception {
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
index 1524062..cd0cf20 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestBigLinkedList.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.IntegrationTestBase;
@@ -776,14 +776,14 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
.build();
// If we want to pre-split compute how many splits.
- if (conf.getBoolean(HBaseTestingUtility.PRESPLIT_TEST_TABLE_KEY,
- HBaseTestingUtility.PRESPLIT_TEST_TABLE)) {
+ if (conf.getBoolean(HBaseTestingUtil.PRESPLIT_TEST_TABLE_KEY,
+ HBaseTestingUtil.PRESPLIT_TEST_TABLE)) {
int numberOfServers = admin.getRegionServers().size();
if (numberOfServers == 0) {
throw new IllegalStateException("No live regionservers");
}
- int regionsPerServer = conf.getInt(HBaseTestingUtility.REGIONS_PER_SERVER_KEY,
- HBaseTestingUtility.DEFAULT_REGIONS_PER_SERVER);
+ int regionsPerServer = conf.getInt(HBaseTestingUtil.REGIONS_PER_SERVER_KEY,
+ HBaseTestingUtil.DEFAULT_REGIONS_PER_SERVER);
int totalNumberOfRegions = numberOfServers * regionsPerServer;
LOG.info("Number of live regionservers: " + numberOfServers + ", " +
"pre-splitting table into " + totalNumberOfRegions + " regions " +
@@ -1932,9 +1932,9 @@ public class IntegrationTestBigLinkedList extends IntegrationTestBase {
System.err.println(" -D"+ TABLE_NAME_KEY+ "=<tableName>");
System.err.println(" Run using the <tableName> as the tablename. Defaults to "
+ DEFAULT_TABLE_NAME);
- System.err.println(" -D"+ HBaseTestingUtility.REGIONS_PER_SERVER_KEY+ "=<# regions>");
+ System.err.println(" -D"+ HBaseTestingUtil.REGIONS_PER_SERVER_KEY+ "=<# regions>");
System.err.println(" Create table with presplit regions per server. Defaults to "
- + HBaseTestingUtility.DEFAULT_REGIONS_PER_SERVER);
+ + HBaseTestingUtil.DEFAULT_REGIONS_PER_SERVER);
System.err.println(" -DuseMob=<true|false>");
System.err.println(" Create table so that the mob read/write path is forced. " +
diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.java
index 9c91796..5dcd84e 100644
--- a/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.java
+++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/test/IntegrationTestLoadCommonCrawl.java
@@ -39,7 +39,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.IntegrationTestBase;
import org.apache.hadoop.hbase.IntegrationTestingUtility;
@@ -448,14 +448,14 @@ public class IntegrationTestLoadCommonCrawl extends IntegrationTestBase {
.setColumnFamilies(families)
.build();
- if (getConf().getBoolean(HBaseTestingUtility.PRESPLIT_TEST_TABLE_KEY,
- HBaseTestingUtility.PRESPLIT_TEST_TABLE)) {
+ if (getConf().getBoolean(HBaseTestingUtil.PRESPLIT_TEST_TABLE_KEY,
+ HBaseTestingUtil.PRESPLIT_TEST_TABLE)) {
int numberOfServers = admin.getRegionServers().size();
if (numberOfServers == 0) {
throw new IllegalStateException("No live regionservers");
}
- int regionsPerServer = getConf().getInt(HBaseTestingUtility.REGIONS_PER_SERVER_KEY,
- HBaseTestingUtility.DEFAULT_REGIONS_PER_SERVER);
+ int regionsPerServer = getConf().getInt(HBaseTestingUtil.REGIONS_PER_SERVER_KEY,
+ HBaseTestingUtil.DEFAULT_REGIONS_PER_SERVER);
int totalNumberOfRegions = numberOfServers * regionsPerServer;
LOG.info("Creating test table: " + tableDescriptor);
LOG.info("Number of live regionservers: " + numberOfServers + ", " +
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java
index 79fefbf..21e5b0a 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/TestPerformanceEvaluation.java
@@ -60,7 +60,7 @@ public class TestPerformanceEvaluation {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestPerformanceEvaluation.class);
- private static final HBaseTestingUtility HTU = new HBaseTestingUtility();
+ private static final HBaseTestingUtil HTU = new HBaseTestingUtil();
@Test
public void testDefaultInMemoryCompaction() {
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
index 94fe1e6..2c5abec 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection;
@@ -84,7 +84,7 @@ public class TestTableInputFormat {
private static final Logger LOG = LoggerFactory.getLogger(TestTableInputFormat.class);
- private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();
static final byte[] FAMILY = Bytes.toBytes("family");
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java
index fe16006..e28cbb6 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableMapReduceUtil.java
@@ -29,7 +29,7 @@ import java.util.Set;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
@@ -88,7 +88,7 @@ public class TestTableMapReduceUtil {
private static ImmutableMap<String, ImmutableSet<String>> relation = ImmutableMap
.of(PRESIDENT_PATTERN, presidentsRowKeys, ACTOR_PATTERN, actorsRowKeys);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
@BeforeClass
public static void beforeClass() throws Exception {
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableOutputFormatConnectionExhaust.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableOutputFormatConnectionExhaust.java
index 746ac53..b14bc9a 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableOutputFormatConnectionExhaust.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableOutputFormatConnectionExhaust.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.fail;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -52,7 +52,7 @@ public class TestTableOutputFormatConnectionExhaust {
private static final Logger LOG =
LoggerFactory.getLogger(TestTableOutputFormatConnectionExhaust.class);
- private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();
static final String TABLE = "TestTableOutputFormatConnectionExhaust";
static final String FAMILY = "family";
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java
index 9e05a85..f0556ca 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapred/TestTableSnapshotInputFormat.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.Iterator;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Result;
@@ -91,8 +91,8 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
public static class TestTableSnapshotReducer extends MapReduceBase
implements Reducer<ImmutableBytesWritable, NullWritable, NullWritable, NullWritable> {
- HBaseTestingUtility.SeenRowTracker rowTracker =
- new HBaseTestingUtility.SeenRowTracker(aaa, after_zzz);
+ HBaseTestingUtil.SeenRowTracker rowTracker =
+ new HBaseTestingUtil.SeenRowTracker(aaa, after_zzz);
@Override
public void reduce(ImmutableBytesWritable key, Iterator<NullWritable> values,
@@ -171,7 +171,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
}
@Override
- protected void testWithMockedMapReduce(HBaseTestingUtility util, String snapshotName,
+ protected void testWithMockedMapReduce(HBaseTestingUtil util, String snapshotName,
int numRegions, int numSplitsPerRegion, int expectedNumSplits, boolean setLocalityEnabledTo)
throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
@@ -212,8 +212,8 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
Assert.assertEquals(expectedNumSplits, splits.length);
- HBaseTestingUtility.SeenRowTracker rowTracker =
- new HBaseTestingUtility.SeenRowTracker(startRow, stopRow);
+ HBaseTestingUtil.SeenRowTracker rowTracker =
+ new HBaseTestingUtil.SeenRowTracker(startRow, stopRow);
// SNAPSHOT_INPUTFORMAT_LOCALITY_ENABLED_KEY is not explicitly specified,
// so the default value is taken.
@@ -256,7 +256,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
}
@Override
- protected void testWithMapReduceImpl(HBaseTestingUtility util, TableName tableName,
+ protected void testWithMapReduceImpl(HBaseTestingUtil util, TableName tableName,
String snapshotName, Path tableDir, int numRegions, int numSplitsPerRegion,
int expectedNumSplits, boolean shutdownCluster) throws Exception {
doTestWithMapReduce(util, tableName, snapshotName, getStartRow(), getEndRow(), tableDir,
@@ -264,7 +264,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
}
// this is also called by the IntegrationTestTableSnapshotInputFormat
- public static void doTestWithMapReduce(HBaseTestingUtility util, TableName tableName,
+ public static void doTestWithMapReduce(HBaseTestingUtil util, TableName tableName,
String snapshotName, byte[] startRow, byte[] endRow, Path tableDir, int numRegions,
int numSplitsPerRegion,int expectedNumSplits, boolean shutdownCluster) throws Exception {
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatTestBase.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatTestBase.java
index e9a385c..45eb55f 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatTestBase.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/MultiTableInputFormatTestBase.java
@@ -31,7 +31,7 @@ import java.util.NavigableMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
@@ -56,7 +56,7 @@ import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
*/
public abstract class MultiTableInputFormatTestBase {
static final Logger LOG = LoggerFactory.getLogger(TestMultiTableInputFormat.class);
- public static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ public static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
static final String TABLE_NAME = "scantest";
static final byte[] INPUT_FAMILY = Bytes.toBytes("contents");
static final String KEY_STARTROW = "startRow";
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatTestBase.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatTestBase.java
index 83f8e0c..63e9cdb 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatTestBase.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatTestBase.java
@@ -27,8 +27,8 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellScanner;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.StartMiniClusterOption;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.Result;
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
public abstract class TableSnapshotInputFormatTestBase {
private static final Logger LOG = LoggerFactory.getLogger(TableSnapshotInputFormatTestBase.class);
- protected final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ protected final HBaseTestingUtil UTIL = new HBaseTestingUtil();
protected static final int NUM_REGION_SERVERS = 2;
protected static final byte[][] FAMILIES = {Bytes.toBytes("f1"), Bytes.toBytes("f2")};
@@ -61,7 +61,7 @@ public abstract class TableSnapshotInputFormatTestBase {
@Before
public void setupCluster() throws Exception {
setupConf(UTIL.getConfiguration());
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numRegionServers(NUM_REGION_SERVERS).numDataNodes(NUM_REGION_SERVERS)
.createRootDir(true).build();
UTIL.startMiniCluster(option);
@@ -79,11 +79,11 @@ public abstract class TableSnapshotInputFormatTestBase {
conf.setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);
}
- protected abstract void testWithMockedMapReduce(HBaseTestingUtility util, String snapshotName,
+ protected abstract void testWithMockedMapReduce(HBaseTestingUtil util, String snapshotName,
int numRegions, int numSplitsPerRegion, int expectedNumSplits, boolean setLocalityEnabledTo)
throws Exception;
- protected abstract void testWithMapReduceImpl(HBaseTestingUtility util, TableName tableName,
+ protected abstract void testWithMapReduceImpl(HBaseTestingUtil util, TableName tableName,
String snapshotName, Path tableDir, int numRegions, int numSplitsPerRegion,
int expectedNumSplits, boolean shutdownCluster) throws Exception;
@@ -160,7 +160,7 @@ public abstract class TableSnapshotInputFormatTestBase {
public abstract void testRestoreSnapshotDoesNotCreateBackRefLinksInit(TableName tableName,
String snapshotName, Path tmpTableDir) throws Exception;
- protected void testWithMapReduce(HBaseTestingUtility util, String snapshotName, int numRegions,
+ protected void testWithMapReduce(HBaseTestingUtil util, String snapshotName, int numRegions,
int numSplitsPerRegion, int expectedNumSplits, boolean shutdownCluster) throws Exception {
Path tableDir = util.getDataTestDirOnTestFS(snapshotName);
TableName tableName = TableName.valueOf("testWithMapReduce");
@@ -188,7 +188,7 @@ public abstract class TableSnapshotInputFormatTestBase {
}
}
- protected static void createTableAndSnapshot(HBaseTestingUtility util, TableName tableName,
+ protected static void createTableAndSnapshot(HBaseTestingUtil util, TableName tableName,
String snapshotName, byte[] startRow, byte[] endRow, int numRegions)
throws Exception {
try {
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java
index 6908678..5bc548b 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCellCounter.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Table;
@@ -56,7 +56,7 @@ public class TestCellCounter {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestCellCounter.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final byte[] ROW1 = Bytes.toBytesBinary("\\x01row1");
private static final byte[] ROW2 = Bytes.toBytesBinary("\\x01row2");
private static final String FAMILY_A_STRING = "a";
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java
index 7f983d3..f25a986 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestCopyTable.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -67,7 +67,7 @@ public class TestCopyTable {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestCopyTable.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final byte[] ROW1 = Bytes.toBytes("row1");
private static final byte[] ROW2 = Bytes.toBytes("row2");
private static final String FAMILY_A_STRING = "a";
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHBaseMRTestingUtility.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHBaseMRTestingUtility.java
index 2467dca..09b9b5e 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHBaseMRTestingUtility.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHBaseMRTestingUtility.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hbase.mapreduce;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MapReduceTests;
import org.junit.ClassRule;
@@ -48,7 +48,7 @@ public class TestHBaseMRTestingUtility {
dummyProps.put("mapreduce.jobhistory.webapp.address", "dummyhost:11238");
dummyProps.put("yarn.resourcemanager.webapp.address", "dummyhost:11239");
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
// populate the mr props to the Configuration instance
for (Map.Entry<String, String> entry : dummyProps.entrySet()) {
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
index 04b53e0..12f1a62 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java
@@ -58,7 +58,7 @@ import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HDFSBlocksDistribution;
import org.apache.hadoop.hbase.HadoopShims;
@@ -66,7 +66,7 @@ import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.PerformanceEvaluation;
import org.apache.hadoop.hbase.PrivateCellUtil;
import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.StartMiniClusterOption;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Tag;
import org.apache.hadoop.hbase.TagType;
@@ -153,7 +153,7 @@ public class TestHFileOutputFormat2 {
private static final TableName[] TABLE_NAMES = Stream.of("TestTable", "TestTable2",
"TestTable3").map(TableName::valueOf).toArray(TableName[]::new);
- private HBaseTestingUtility util = new HBaseTestingUtility();
+ private HBaseTestingUtil util = new HBaseTestingUtil();
private static final Logger LOG = LoggerFactory.getLogger(TestHFileOutputFormat2.class);
@@ -635,7 +635,7 @@ public class TestHFileOutputFormat2 {
private void doIncrementalLoadTest(boolean shouldChangeRegions, boolean shouldKeepLocality,
boolean putSortReducer, List<String> tableStr) throws Exception {
- util = new HBaseTestingUtility();
+ util = new HBaseTestingUtil();
Configuration conf = util.getConfiguration();
conf.setBoolean(MultiTableHFileOutputFormat.LOCALITY_SENSITIVE_CONF_KEY, shouldKeepLocality);
int hostCount = 1;
@@ -651,7 +651,7 @@ public class TestHFileOutputFormat2 {
for (int i = 0; i < hostCount; ++i) {
hostnames[i] = "datanode_" + i;
}
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numRegionServers(hostCount).dataNodeHosts(hostnames).build();
util.startMiniCluster(option);
@@ -1177,7 +1177,7 @@ public class TestHFileOutputFormat2 {
TableDescriptorBuilder.newBuilder(TABLE_NAMES[0]);
Mockito.doReturn(tableDescriptorBuilder.build()).when(table).getDescriptor();
- for (ColumnFamilyDescriptor hcd : HBaseTestingUtility.generateColumnDescriptors()) {
+ for (ColumnFamilyDescriptor hcd : HBaseTestingUtil.generateColumnDescriptors()) {
tableDescriptorBuilder.setColumnFamily(hcd);
}
@@ -1454,7 +1454,7 @@ public class TestHFileOutputFormat2 {
public void manualTest(String args[]) throws Exception {
Configuration conf = HBaseConfiguration.create();
- util = new HBaseTestingUtility(conf);
+ util = new HBaseTestingUtil(conf);
if ("newtable".equals(args[0])) {
TableName tname = TableName.valueOf(args[1]);
byte[][] splitKeys = generateRandomSplitKeys(4);
@@ -1476,7 +1476,7 @@ public class TestHFileOutputFormat2 {
@Test
public void testBlockStoragePolicy() throws Exception {
- util = new HBaseTestingUtility();
+ util = new HBaseTestingUtil();
Configuration conf = util.getConfiguration();
conf.set(HFileOutputFormat2.STORAGE_POLICY_PROPERTY, "ALL_SSD");
@@ -1652,7 +1652,7 @@ public class TestHFileOutputFormat2 {
@Test
public void testMRIncrementalLoadWithLocalityMultiCluster() throws Exception {
// Start cluster A
- util = new HBaseTestingUtility();
+ util = new HBaseTestingUtil();
Configuration confA = util.getConfiguration();
int hostCount = 3;
int regionNum = 20;
@@ -1660,12 +1660,12 @@ public class TestHFileOutputFormat2 {
for (int i = 0; i < hostCount; ++i) {
hostnames[i] = "datanode_" + i;
}
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numRegionServers(hostCount).dataNodeHosts(hostnames).build();
util.startMiniCluster(option);
// Start cluster B
- HBaseTestingUtility utilB = new HBaseTestingUtility();
+ HBaseTestingUtil utilB = new HBaseTestingUtil();
Configuration confB = utilB.getConfiguration();
utilB.startMiniCluster(option);
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java
index 77245f3..a2c4fba 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHRegionPartitioner.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.testclassification.MapReduceTests;
@@ -42,7 +42,7 @@ public class TestHRegionPartitioner {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestHRegionPartitioner.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHashTable.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHashTable.java
index ffcc900..ff1ac74 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHashTable.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestHashTable.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Table;
@@ -58,7 +58,7 @@ public class TestHashTable {
private static final Logger LOG = LoggerFactory.getLogger(TestHashTable.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
index fe35012..8a21c56 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
@@ -45,7 +45,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeepDeletedCells;
import org.apache.hadoop.hbase.KeyValue;
@@ -118,7 +118,7 @@ public class TestImportExport {
HBaseClassTestRule.forClass(TestImportExport.class);
private static final Logger LOG = LoggerFactory.getLogger(TestImportExport.class);
- protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final byte[] ROW1 = Bytes.toBytesBinary("\\x32row1");
private static final byte[] ROW2 = Bytes.toBytesBinary("\\x32row2");
private static final byte[] ROW3 = Bytes.toBytesBinary("\\x32row3");
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java
index 83a457f..3e17bd9 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithOperationAttributes.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection;
@@ -75,7 +75,7 @@ public class TestImportTSVWithOperationAttributes implements Configurable {
private static final Logger LOG =
LoggerFactory.getLogger(TestImportTSVWithOperationAttributes.class);
protected static final String NAME = TestImportTsv.class.getSimpleName();
- protected static HBaseTestingUtility util = new HBaseTestingUtility();
+ protected static HBaseTestingUtil util = new HBaseTestingUtil();
/**
* Delete the tmp directory after running doMROnTableTest. Boolean. Default is
@@ -163,7 +163,7 @@ public class TestImportTSVWithOperationAttributes implements Configurable {
* @param dataAvailable
* @return The Tool instance used to run the test.
*/
- private Tool doMROnTableTest(HBaseTestingUtility util, String family, String data, String[] args,
+ private Tool doMROnTableTest(HBaseTestingUtil util, String family, String data, String[] args,
int valueMultiplier, boolean dataAvailable) throws Exception {
String table = args[args.length - 1];
Configuration conf = new Configuration(util.getConfiguration());
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithTTLs.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithTTLs.java
index b8b6bb8..f981ffc 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithTTLs.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithTTLs.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Durability;
import org.apache.hadoop.hbase.client.Put;
@@ -64,7 +64,7 @@ public class TestImportTSVWithTTLs implements Configurable {
protected static final Logger LOG = LoggerFactory.getLogger(TestImportTSVWithTTLs.class);
protected static final String NAME = TestImportTsv.class.getSimpleName();
- protected static HBaseTestingUtility util = new HBaseTestingUtility();
+ protected static HBaseTestingUtil util = new HBaseTestingUtil();
/**
* Delete the tmp directory after running doMROnTableTest. Boolean. Default is
@@ -124,7 +124,7 @@ public class TestImportTSVWithTTLs implements Configurable {
util.deleteTable(tableName);
}
- protected static Tool doMROnTableTest(HBaseTestingUtility util, String family, String data,
+ protected static Tool doMROnTableTest(HBaseTestingUtil util, String family, String data,
String[] args, int valueMultiplier) throws Exception {
TableName table = TableName.valueOf(args[args.length - 1]);
Configuration conf = new Configuration(util.getConfiguration());
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java
index a78ba81..049ec0a 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTSVWithVisibilityLabels.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection;
@@ -86,7 +86,7 @@ public class TestImportTSVWithVisibilityLabels implements Configurable {
private static final Logger LOG =
LoggerFactory.getLogger(TestImportTSVWithVisibilityLabels.class);
protected static final String NAME = TestImportTsv.class.getSimpleName();
- protected static HBaseTestingUtility util = new HBaseTestingUtility();
+ protected static HBaseTestingUtil util = new HBaseTestingUtil();
/**
* Delete the tmp directory after running doMROnTableTest. Boolean. Default is
@@ -320,7 +320,7 @@ public class TestImportTSVWithVisibilityLabels implements Configurable {
util.deleteTable(tableName);
}
- protected static Tool doMROnTableTest(HBaseTestingUtility util, String family, String data,
+ protected static Tool doMROnTableTest(HBaseTestingUtil util, String family, String data,
String[] args, int valueMultiplier) throws Exception {
return doMROnTableTest(util, family, data, args, valueMultiplier, -1);
}
@@ -338,7 +338,7 @@ public class TestImportTSVWithVisibilityLabels implements Configurable {
*
* @return The Tool instance used to run the test.
*/
- protected static Tool doMROnTableTest(HBaseTestingUtility util, String family, String data,
+ protected static Tool doMROnTableTest(HBaseTestingUtil util, String family, String data,
String[] args, int valueMultiplier,int expectedKVCount) throws Exception {
TableName table = TableName.valueOf(args[args.length - 1]);
Configuration conf = new Configuration(util.getConfiguration());
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
index fb213a3..bf4c868 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java
@@ -38,7 +38,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotFoundException;
@@ -80,7 +80,7 @@ public class TestImportTsv implements Configurable {
private static final Logger LOG = LoggerFactory.getLogger(TestImportTsv.class);
protected static final String NAME = TestImportTsv.class.getSimpleName();
- protected static HBaseTestingUtility util = new HBaseTestingUtility();
+ protected static HBaseTestingUtil util = new HBaseTestingUtil();
// Delete the tmp directory after running doMROnTableTest. Boolean. Default is true.
protected static final String DELETE_AFTER_LOAD_CONF = NAME + ".deleteAfterLoad";
@@ -385,7 +385,7 @@ public class TestImportTsv implements Configurable {
return doMROnTableTest(util, tn, FAMILY, data, args, valueMultiplier,-1);
}
- protected static Tool doMROnTableTest(HBaseTestingUtility util, TableName table,
+ protected static Tool doMROnTableTest(HBaseTestingUtil util, TableName table,
String family, String data, Map<String, String> args) throws Exception {
return doMROnTableTest(util, table, family, data, args, 1,-1);
}
@@ -398,7 +398,7 @@ public class TestImportTsv implements Configurable {
* @param args Any arguments to pass BEFORE inputFile path is appended.
* @return The Tool instance used to run the test.
*/
- protected static Tool doMROnTableTest(HBaseTestingUtility util, TableName table,
+ protected static Tool doMROnTableTest(HBaseTestingUtil util, TableName table,
String family, String data, Map<String, String> args, int valueMultiplier,int expectedKVCount)
throws Exception {
Configuration conf = new Configuration(util.getConfiguration());
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java
index dacc15c..d55fc82 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestMultithreadedTableMapper.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
@@ -65,8 +65,8 @@ public class TestMultithreadedTableMapper {
HBaseClassTestRule.forClass(TestMultithreadedTableMapper.class);
private static final Logger LOG = LoggerFactory.getLogger(TestMultithreadedTableMapper.class);
- private static final HBaseTestingUtility UTIL =
- new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL =
+ new HBaseTestingUtil();
static final TableName MULTI_REGION_TABLE_NAME = TableName.valueOf("mrtest");
static final byte[] INPUT_FAMILY = Bytes.toBytes("contents");
static final byte[] OUTPUT_FAMILY = Bytes.toBytes("text");
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
index 5793dfa..d33f30a 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java
@@ -28,7 +28,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Table;
@@ -58,7 +58,7 @@ public class TestRowCounter {
HBaseClassTestRule.forClass(TestRowCounter.class);
private static final Logger LOG = LoggerFactory.getLogger(TestRowCounter.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private final static String TABLE_NAME = "testRowCounter";
private final static String TABLE_NAME_TS_RANGE = "testRowCounter_ts_range";
private final static String COL_FAM = "col_fam";
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
index b28d8d9..f93e76a 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSimpleTotalOrderPartitioner.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
import org.apache.hadoop.hbase.testclassification.MapReduceTests;
@@ -41,7 +41,7 @@ public class TestSimpleTotalOrderPartitioner {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestSimpleTotalOrderPartitioner.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
Configuration conf = TEST_UTIL.getConfiguration();
@Test
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSyncTable.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSyncTable.java
index ef0e0d9..da0d7b1 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSyncTable.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestSyncTable.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Result;
@@ -63,7 +63,7 @@ public class TestSyncTable {
private static final Logger LOG = LoggerFactory.getLogger(TestSyncTable.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormat.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormat.java
index 8cf9001..197060d 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormat.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormat.java
@@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Connection;
@@ -82,7 +82,7 @@ public class TestTableInputFormat {
private static final Logger LOG = LoggerFactory.getLogger(TestTableInputFormat.class);
- private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static MiniMRCluster mrCluster;
static final byte[] FAMILY = Bytes.toBytes("family");
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java
index 7855747..eab1d87 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java
@@ -29,7 +29,7 @@ import java.util.Map;
import java.util.NavigableMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Result;
import org.apache.hadoop.hbase.client.Scan;
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
public abstract class TestTableInputFormatScanBase {
private static final Logger LOG = LoggerFactory.getLogger(TestTableInputFormatScanBase.class);
- static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
static final TableName TABLE_NAME = TableName.valueOf("scantest");
static final byte[][] INPUT_FAMILYS = {Bytes.toBytes("content1"), Bytes.toBytes("content2")};
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java
index f86f20d..bca27ec 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableMapReduceBase.java
@@ -28,7 +28,7 @@ import java.util.NavigableMap;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
@@ -50,7 +50,7 @@ import org.slf4j.Logger;
* implementations.
*/
public abstract class TestTableMapReduceBase {
- protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
protected static final TableName MULTI_REGION_TABLE_NAME = TableName.valueOf("mrtest");
protected static final TableName TABLE_FOR_NEGATIVE_TESTS = TableName.valueOf("testfailuretable");
protected static final byte[] INPUT_FAMILY = Bytes.toBytes("contents");
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
index 88e40a7..1905beb 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableRecordReader.java
@@ -25,7 +25,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTestConst;
import org.apache.hadoop.hbase.KeyValue;
@@ -46,7 +46,7 @@ import org.junit.experimental.categories.Category;
@Category(MediumTests.class)
public class TestTableRecordReader {
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java
index b6e92f9..15a61e0 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableSnapshotInputFormat.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HDFSBlocksDistribution;
import org.apache.hadoop.hbase.TableName;
@@ -154,8 +154,8 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
public static class TestTableSnapshotReducer
extends Reducer<ImmutableBytesWritable, NullWritable, NullWritable, NullWritable> {
- HBaseTestingUtility.SeenRowTracker rowTracker =
- new HBaseTestingUtility.SeenRowTracker(bbb, yyy);
+ HBaseTestingUtil.SeenRowTracker rowTracker =
+ new HBaseTestingUtil.SeenRowTracker(bbb, yyy);
@Override
protected void reduce(ImmutableBytesWritable key, Iterable<NullWritable> values,
Context context) throws IOException, InterruptedException {
@@ -208,7 +208,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
}
@Override
- public void testWithMockedMapReduce(HBaseTestingUtility util, String snapshotName,
+ public void testWithMockedMapReduce(HBaseTestingUtil util, String snapshotName,
int numRegions, int numSplitsPerRegion, int expectedNumSplits, boolean setLocalityEnabledTo)
throws Exception {
final TableName tableName = TableName.valueOf(name.getMethodName());
@@ -399,7 +399,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
Assert.assertEquals(expectedNumSplits, splits.size());
- HBaseTestingUtility.SeenRowTracker rowTracker = new HBaseTestingUtility.SeenRowTracker(startRow,
+ HBaseTestingUtil.SeenRowTracker rowTracker = new HBaseTestingUtil.SeenRowTracker(startRow,
stopRow.length > 0 ? stopRow : Bytes.toBytes("\uffff"));
boolean localityEnabled =
@@ -454,7 +454,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
}
@Override
- protected void testWithMapReduceImpl(HBaseTestingUtility util, TableName tableName,
+ protected void testWithMapReduceImpl(HBaseTestingUtil util, TableName tableName,
String snapshotName, Path tableDir, int numRegions, int numSplitsPerRegion,
int expectedNumSplits, boolean shutdownCluster) throws Exception {
doTestWithMapReduce(util, tableName, snapshotName, getStartRow(), getEndRow(), tableDir,
@@ -462,7 +462,7 @@ public class TestTableSnapshotInputFormat extends TableSnapshotInputFormatTestBa
}
// this is also called by the IntegrationTestTableSnapshotInputFormat
- public static void doTestWithMapReduce(HBaseTestingUtility util, TableName tableName,
+ public static void doTestWithMapReduce(HBaseTestingUtil util, TableName tableName,
String snapshotName, byte[] startRow, byte[] endRow, Path tableDir, int numRegions,
int numSplitsPerRegion, int expectedNumSplits, boolean shutdownCluster) throws Exception {
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
index b7c2f21..bf25c1ca 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTimeRangeMapRed.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -69,8 +69,8 @@ public class TestTimeRangeMapRed {
HBaseClassTestRule.forClass(TestTimeRangeMapRed.class);
private final static Logger log = LoggerFactory.getLogger(TestTimeRangeMapRed.class);
- private static final HBaseTestingUtility UTIL =
- new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL =
+ new HBaseTestingUtil();
private Admin admin;
private static final byte [] KEY = Bytes.toBytes("row1");
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
index d60a3d9..aac4ae5 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALPlayer.java
@@ -34,10 +34,10 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
@@ -78,8 +78,8 @@ public class TestWALPlayer {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestWALPlayer.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
- private static MiniHBaseCluster cluster;
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
+ private static SingleProcessHBaseCluster cluster;
private static Path rootDir;
private static Path walRootDir;
private static FileSystem fs;
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java
index c30235a..5e1c097 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.TableName;
@@ -71,7 +71,7 @@ public class TestWALRecordReader {
HBaseClassTestRule.forClass(TestWALRecordReader.class);
private static final Logger LOG = LoggerFactory.getLogger(TestWALRecordReader.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static Configuration conf;
private static FileSystem fs;
private static Path hbaseDir;
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionTool.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionTool.java
index 26cee49..f286c63 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionTool.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactionTool.java
@@ -25,7 +25,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -46,7 +46,7 @@ public class TestCompactionTool {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestCompactionTool.class);
- private final HBaseTestingUtility testUtil = new HBaseTestingUtility();
+ private final HBaseTestingUtil testUtil = new HBaseTestingUtil();
private HRegion region;
private final static byte[] qualifier = Bytes.toBytes("qf");
@@ -56,7 +56,7 @@ public class TestCompactionTool {
@Before
public void setUp() throws Exception {
this.testUtil.startMiniCluster();
- testUtil.createTable(tableName, HBaseTestingUtility.fam1);
+ testUtil.createTable(tableName, HBaseTestingUtil.fam1);
rootDir = testUtil.getDefaultRootDirPath();
this.region = testUtil.getMiniHBaseCluster().getRegions(tableName).get(0);
}
@@ -72,12 +72,12 @@ public class TestCompactionTool {
for (int i = 0; i < 10; i++) {
this.putAndFlush(i);
}
- HStore store = region.getStore(HBaseTestingUtility.fam1);
+ HStore store = region.getStore(HBaseTestingUtil.fam1);
assertEquals(10, store.getStorefilesCount());
Path tableDir = CommonFSUtils.getTableDir(rootDir, region.getRegionInfo().getTable());
FileSystem fs = store.getFileSystem();
String storePath = tableDir + "/" + region.getRegionInfo().getEncodedName() + "/"
- + Bytes.toString(HBaseTestingUtility.fam1);
+ + Bytes.toString(HBaseTestingUtil.fam1);
FileStatus[] regionDirFiles = fs.listStatus(new Path(storePath));
assertEquals(10, regionDirFiles.length);
String defaultFS = testUtil.getMiniHBaseCluster().getConfiguration().get("fs.defaultFS");
@@ -92,7 +92,7 @@ public class TestCompactionTool {
private void putAndFlush(int key) throws Exception{
Put put = new Put(Bytes.toBytes(key));
- put.addColumn(HBaseTestingUtility.fam1, qualifier, Bytes.toBytes("val" + key));
+ put.addColumn(HBaseTestingUtil.fam1, qualifier, Bytes.toBytes("val" + key));
region.put(put);
region.flush(true);
}
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplication.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplication.java
index 04b766d..c614b44 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplication.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplication.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
@@ -101,7 +101,7 @@ public class TestVerifyReplication extends TestReplicationBase {
Connection connection2 = ConnectionFactory.createConnection(CONF2);
try (Admin admin2 = connection2.getAdmin()) {
- admin2.createTable(peerTable, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
+ admin2.createTable(peerTable, HBaseTestingUtil.KEYS_FOR_HBA_CREATE_TABLE);
}
htable3 = connection2.getTable(peerTableName);
}
@@ -174,10 +174,10 @@ public class TestVerifyReplication extends TestReplicationBase {
Connection connection1 = ConnectionFactory.createConnection(CONF1);
Connection connection2 = ConnectionFactory.createConnection(CONF2);
try (Admin admin1 = connection1.getAdmin()) {
- admin1.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
+ admin1.createTable(table, HBaseTestingUtil.KEYS_FOR_HBA_CREATE_TABLE);
}
try (Admin admin2 = connection2.getAdmin()) {
- admin2.createTable(table, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
+ admin2.createTable(table, HBaseTestingUtil.KEYS_FOR_HBA_CREATE_TABLE);
}
UTIL1.waitUntilAllRegionsAssigned(tableName);
UTIL2.waitUntilAllRegionsAssigned(tableName);
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationAdjunct.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationAdjunct.java
index 51a0748..fdbf7ac 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationAdjunct.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationAdjunct.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -95,7 +95,7 @@ public class TestVerifyReplicationAdjunct extends TestReplicationBase {
.build()).build();
Connection connection2 = ConnectionFactory.createConnection(CONF2);
try (Admin admin2 = connection2.getAdmin()) {
- admin2.createTable(peerTable, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
+ admin2.createTable(peerTable, HBaseTestingUtil.KEYS_FOR_HBA_CREATE_TABLE);
}
htable3 = connection2.getTable(peerTableName);
}
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationCrossDiffHdfs.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationCrossDiffHdfs.java
index 1ab1f1a..2fe843b 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationCrossDiffHdfs.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/replication/TestVerifyReplicationCrossDiffHdfs.java
@@ -27,7 +27,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
@@ -69,9 +69,9 @@ public class TestVerifyReplicationCrossDiffHdfs {
private static final Logger LOG =
LoggerFactory.getLogger(TestVerifyReplicationCrossDiffHdfs.class);
- private static HBaseTestingUtility util1;
- private static HBaseTestingUtility util2;
- private static HBaseTestingUtility mapReduceUtil = new HBaseTestingUtility();
+ private static HBaseTestingUtil util1;
+ private static HBaseTestingUtil util2;
+ private static HBaseTestingUtil mapReduceUtil = new HBaseTestingUtil();
private static Configuration conf1 = HBaseConfiguration.create();
private static Configuration conf2;
@@ -84,14 +84,14 @@ public class TestVerifyReplicationCrossDiffHdfs {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
conf1.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/1");
- util1 = new HBaseTestingUtility(conf1);
+ util1 = new HBaseTestingUtil(conf1);
util1.startMiniZKCluster();
MiniZooKeeperCluster miniZK = util1.getZkCluster();
conf1 = util1.getConfiguration();
conf2 = HBaseConfiguration.create(conf1);
conf2.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");
- util2 = new HBaseTestingUtility(conf2);
+ util2 = new HBaseTestingUtil(conf2);
util2.setZkCluster(miniZK);
util1.startMiniCluster();
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
index d7da714..d488b070 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
@@ -73,7 +73,7 @@ public class TestExportSnapshot {
private static final Logger LOG = LoggerFactory.getLogger(TestExportSnapshot.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected final static byte[] FAMILY = Bytes.toBytes("cf");
@@ -334,7 +334,7 @@ public class TestExportSnapshot {
return path;
}
- static Path getLocalDestinationDir(HBaseTestingUtility htu) {
+ static Path getLocalDestinationDir(HBaseTestingUtil htu) {
Path path = htu.getDataTestDir("local-export-" + EnvironmentEdgeManager.currentTime());
try {
FileSystem fs = FileSystem.getLocal(htu.getConfiguration());
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java
index 37933e6..6569767 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotAdjunct.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.testclassification.LargeTests;
@@ -59,7 +59,7 @@ public class TestExportSnapshotAdjunct {
@Rule
public final TestName testName = new TestName();
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected TableName tableName;
private String emptySnapshotName;
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV1NoCluster.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV1NoCluster.java
index 8b5687b..94b737c 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV1NoCluster.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV1NoCluster.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
@@ -52,7 +52,7 @@ public class TestExportSnapshotV1NoCluster {
HBaseClassTestRule.forClass(TestExportSnapshotV1NoCluster.class);
private static final Logger LOG = LoggerFactory.getLogger(TestExportSnapshotV1NoCluster.class);
- private HBaseCommonTestingUtility testUtil = new HBaseCommonTestingUtility();
+ private HBaseCommonTestingUtil testUtil = new HBaseCommonTestingUtil();
private Path testDir;
private FileSystem fs;
@@ -70,7 +70,7 @@ public class TestExportSnapshotV1NoCluster {
* Setup for test. Returns path to test data dir. Sets configuration into the passed
* hctu.getConfiguration.
*/
- static Path setup(FileSystem fs, HBaseCommonTestingUtility hctu) throws IOException {
+ static Path setup(FileSystem fs, HBaseCommonTestingUtil hctu) throws IOException {
Path testDir = hctu.getDataTestDir().makeQualified(fs.getUri(), fs.getWorkingDirectory());
hctu.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true);
hctu.getConfiguration().setInt("hbase.regionserver.msginterval", 100);
@@ -99,7 +99,7 @@ public class TestExportSnapshotV1NoCluster {
* and then it will run the export and verification.
*/
static void testSnapshotWithRefsExportFileSystemState(FileSystem fs,
- SnapshotMock.SnapshotBuilder builder, HBaseCommonTestingUtility testUtil, Path testDir)
+ SnapshotMock.SnapshotBuilder builder, HBaseCommonTestingUtil testUtil, Path testDir)
throws Exception {
Path[] r1Files = builder.addRegion();
Path[] r2Files = builder.addRegion();
@@ -112,7 +112,7 @@ public class TestExportSnapshotV1NoCluster {
testDir, getDestinationDir(fs, testUtil, testDir), false, null, true);
}
- static Path getDestinationDir(FileSystem fs, HBaseCommonTestingUtility hctu, Path testDir)
+ static Path getDestinationDir(FileSystem fs, HBaseCommonTestingUtil hctu, Path testDir)
throws IOException {
Path path = new Path(new Path(testDir, "export-test"),
"export-" + EnvironmentEdgeManager.currentTime()).makeQualified(fs.getUri(),
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV2NoCluster.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV2NoCluster.java
index 4cd1dfd..f2d3f62 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV2NoCluster.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/snapshot/TestExportSnapshotV2NoCluster.java
@@ -21,7 +21,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocalFileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.snapshot.SnapshotTestingUtils.SnapshotMock;
import org.apache.hadoop.hbase.testclassification.MapReduceTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -44,7 +44,7 @@ public class TestExportSnapshotV2NoCluster {
private static final Logger LOG = LoggerFactory.getLogger(TestExportSnapshotV2NoCluster.class);
- private HBaseCommonTestingUtility testUtil = new HBaseCommonTestingUtility();
+ private HBaseCommonTestingUtil testUtil = new HBaseCommonTestingUtil();
private Path testDir;
private FileSystem fs;
diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
index 7614b83..c2f22f6 100644
--- a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
+++ b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/util/LoadTestTool.java
@@ -29,7 +29,7 @@ import javax.crypto.spec.SecretKeySpec;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
@@ -571,7 +571,7 @@ public class LoadTestTool extends AbstractHBaseTool {
durability = Durability.ASYNC_WAL;
}
- HBaseTestingUtility.createPreSplitLoadTestTable(conf, tableName,
+ HBaseTestingUtil.createPreSplitLoadTestTable(conf, tableName,
getColumnFamilies(), compressAlgo, dataBlockEncodingAlgo, numRegionsPerServer,
regionReplication, durability);
applyColumnFamilyOptions(tableName, getColumnFamilies());
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java
index 4f3c443..6c69853 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestChildProcedures.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -51,14 +51,14 @@ public class TestChildProcedures {
private static ProcedureExecutor<TestProcEnv> procExecutor;
private static ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
assertTrue(testDir.depth() > 1);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestForceUpdateProcedure.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestForceUpdateProcedure.java
index 178b0cb..d0d6864 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestForceUpdateProcedure.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestForceUpdateProcedure.java
@@ -26,7 +26,7 @@ import java.util.Map;
import java.util.concurrent.Exchanger;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.NoopProcedure;
import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -50,7 +50,7 @@ public class TestForceUpdateProcedure {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestForceUpdateProcedure.class);
- private static HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ private static HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
private static WALProcedureStore STORE;
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureBypass.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureBypass.java
index 976b718..fa8db41 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureBypass.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureBypass.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -56,7 +56,7 @@ public class TestProcedureBypass {
private static ProcedureExecutor<TestProcEnv> procExecutor;
- private static HBaseCommonTestingUtility htu;
+ private static HBaseCommonTestingUtil htu;
private static FileSystem fs;
private static Path testDir;
@@ -67,7 +67,7 @@ public class TestProcedureBypass {
@BeforeClass
public static void setUp() throws Exception {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
// NOTE: The executor will be created by each test
procEnv = new TestProcEnv();
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureCleanup.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureCleanup.java
index 82917ea..07dd8d8 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureCleanup.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureCleanup.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -60,7 +60,7 @@ public class TestProcedureCleanup {
private static ProcedureExecutor<Void> procExecutor;
- private static HBaseCommonTestingUtility htu;
+ private static HBaseCommonTestingUtil htu;
private static FileSystem fs;
private static Path testDir;
@@ -79,7 +79,7 @@ public class TestProcedureCleanup {
@BeforeClass
public static void setUp() throws Exception {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
htu.getConfiguration().setBoolean(WALProcedureStore.EXEC_WAL_CLEANUP_ON_LOAD_CONF_KEY, true);
// NOTE: The executor will be created by each test
testDir = htu.getDataTestDir();
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.java
index f13a46c..f8cd787 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureEvents.java
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.NoopProcedure;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -54,13 +54,13 @@ public class TestProcedureEvents {
private ProcedureStore procStore;
private ProcedureExecutor<TestProcEnv> procExecutor;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
Path testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
logDir = new Path(testDir, "proc-logs");
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecution.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecution.java
index bbe3778..ba52975 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecution.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecution.java
@@ -27,7 +27,7 @@ import java.util.Objects;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -56,14 +56,14 @@ public class TestProcedureExecution {
private ProcedureExecutor<Void> procExecutor;
private ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
assertTrue(testDir.depth() > 1);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecutor.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecutor.java
index 7f130ca..01d25ac 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecutor.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureExecutor.java
@@ -23,7 +23,7 @@ import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.NoopProcedure;
import org.apache.hadoop.hbase.procedure2.store.NoopProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -50,11 +50,11 @@ public class TestProcedureExecutor {
private NoopProcedureStore procStore;
private ProcedureExecutor<TestProcEnv> procExecutor;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
@Before
public void setUp() throws Exception {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
// NOTE: The executor will be created by each test
procEnv = new TestProcEnv();
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java
index 75c8d16..454b188 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureInMemoryChore.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.NoopProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -51,11 +51,11 @@ public class TestProcedureInMemoryChore {
private NoopProcedureStore procStore;
private ProcedureExecutor<TestProcEnv> procExecutor;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
procEnv = new TestProcEnv();
procStore = new NoopProcedureStore();
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureMetrics.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureMetrics.java
index 4d9df1a..a2f833d 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureMetrics.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureMetrics.java
@@ -25,7 +25,7 @@ import java.io.IOException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -51,7 +51,7 @@ public class TestProcedureMetrics {
private static ProcedureExecutor<TestProcEnv> procExecutor;
private ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@@ -62,7 +62,7 @@ public class TestProcedureMetrics {
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
assertTrue(testDir.depth() > 1);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureNonce.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureNonce.java
index e4d0390..2a5c5ad 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureNonce.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureNonce.java
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.security.User;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -57,13 +57,13 @@ public class TestProcedureNonce {
private static ProcedureExecutor<TestProcEnv> procExecutor;
private static ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
Path testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
assertTrue(testDir.depth() > 1);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.java
index acfd4f4..686b10d 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRecovery.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -60,14 +60,14 @@ public class TestProcedureRecovery {
private static ProcedureStore procStore;
private static int procSleepInterval;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
assertTrue(testDir.depth() > 1);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java
index db54f22..4d7d45d 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureReplayOrder.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -61,14 +61,14 @@ public class TestProcedureReplayOrder {
private TestProcedureEnv procEnv;
private ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
htu.getConfiguration().setInt(WALProcedureStore.SYNC_WAIT_MSEC_CONF_KEY, 25);
testDir = htu.getDataTestDir();
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRollbackAIOOB.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRollbackAIOOB.java
index fc12924..098c53f 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRollbackAIOOB.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureRollbackAIOOB.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.procedure2;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.NoopProcedure;
import org.apache.hadoop.hbase.procedure2.store.wal.WALProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -43,7 +43,7 @@ public class TestProcedureRollbackAIOOB {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestProcedureRollbackAIOOB.class);
- private static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ private static final HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
public static final class ParentProcedure extends NoopProcedure<Void> {
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java
index 4b88792..266082e 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSkipPersistence.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -45,7 +45,7 @@ public class TestProcedureSkipPersistence {
private ProcedureExecutor<ProcEnv> procExecutor;
private ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@@ -125,7 +125,7 @@ public class TestProcedureSkipPersistence {
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
assertTrue(testDir.depth() > 1);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java
index d17c00c..38aef16 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestProcedureSuspended.java
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.NoopProcedureStore;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -52,11 +52,11 @@ public class TestProcedureSuspended {
private ProcedureExecutor<TestProcEnv> procExecutor;
private ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
procStore = new NoopProcedureStore();
procExecutor = new ProcedureExecutor<>(htu.getConfiguration(), new TestProcEnv(), procStore);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestRemoteProcedureDispatcherUncaughtExceptionHandler.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestRemoteProcedureDispatcherUncaughtExceptionHandler.java
index 7f44fc3..ec001d1 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestRemoteProcedureDispatcherUncaughtExceptionHandler.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestRemoteProcedureDispatcherUncaughtExceptionHandler.java
@@ -21,7 +21,7 @@ import java.lang.Thread.UncaughtExceptionHandler;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.junit.After;
@@ -41,7 +41,7 @@ import org.junit.rules.ExpectedException;
@Category({ MasterTests.class, SmallTests.class })
public class TestRemoteProcedureDispatcherUncaughtExceptionHandler {
- private static HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ private static HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.java
index fd708984..cc3c765 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestStateMachineProcedure.java
@@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.NoopProcedure;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
@@ -76,14 +76,14 @@ public class TestStateMachineProcedure {
private ProcedureExecutor<TestProcEnv> procExecutor;
private ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
index e359e5c..890bbd1 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/TestYieldProcedures.java
@@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.testclassification.SmallTests;
@@ -55,14 +55,14 @@ public class TestYieldProcedures {
private TestScheduler procRunnables;
private ProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
fs = testDir.getFileSystem(htu.getConfiguration());
assertTrue(testDir.depth() > 1);
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java
index 90d1b0a..6b8b46e 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/ProcedureWALLoaderPerformanceEvaluation.java
@@ -27,7 +27,7 @@ import java.util.Set;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;
import org.apache.hadoop.hbase.procedure2.store.ProcedureStore;
@@ -39,7 +39,7 @@ import org.apache.hbase.thirdparty.org.apache.commons.cli.CommandLine;
import org.apache.hbase.thirdparty.org.apache.commons.cli.Option;
public class ProcedureWALLoaderPerformanceEvaluation extends AbstractHBaseTool {
- protected static final HBaseCommonTestingUtility UTIL = new HBaseCommonTestingUtility();
+ protected static final HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
// Command line options and defaults.
public static int DEFAULT_NUM_PROCS = 1000000; // 1M
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestStressWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestStressWALProcedureStore.java
index 73d3020..2d7d671 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestStressWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestStressWALProcedureStore.java
@@ -26,7 +26,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.LoadCounter;
import org.apache.hadoop.hbase.procedure2.ProcedureTestingUtility.TestProcedure;
@@ -55,7 +55,7 @@ public class TestStressWALProcedureStore {
private WALProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@@ -68,7 +68,7 @@ public class TestStressWALProcedureStore {
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
setupConfiguration(htu.getConfiguration());
testDir = htu.getDataTestDir();
diff --git a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
index c8335ee..915d619 100644
--- a/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
+++ b/hbase-procedure/src/test/java/org/apache/hadoop/hbase/procedure2/store/wal/TestWALProcedureStore.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.procedure2.Procedure;
import org.apache.hadoop.hbase.procedure2.ProcedureStateSerializer;
@@ -73,7 +73,7 @@ public class TestWALProcedureStore {
private WALProcedureStore procStore;
- private HBaseCommonTestingUtility htu;
+ private HBaseCommonTestingUtil htu;
private FileSystem fs;
private Path testDir;
private Path logDir;
@@ -84,7 +84,7 @@ public class TestWALProcedureStore {
@Before
public void setUp() throws IOException {
- htu = new HBaseCommonTestingUtility();
+ htu = new HBaseCommonTestingUtil();
testDir = htu.getDataTestDir();
htu.getConfiguration().set(HConstants.HBASE_DIR, testDir.toString());
fs = testDir.getFileSystem(htu.getConfiguration());
diff --git a/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java b/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java
index 9eb67f9..3d67bd3 100644
--- a/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java
+++ b/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationStateZKImpl.java
@@ -21,7 +21,7 @@ import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ClusterId;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseZKTestingUtility;
+import org.apache.hadoop.hbase.HBaseZKTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.ReplicationTests;
@@ -46,13 +46,13 @@ public class TestReplicationStateZKImpl extends TestReplicationStateBasic {
HBaseClassTestRule.forClass(TestReplicationStateZKImpl.class);
private static Configuration conf;
- private static HBaseZKTestingUtility utility;
+ private static HBaseZKTestingUtil utility;
private static ZKWatcher zkw;
private static String replicationZNode;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
- utility = new HBaseZKTestingUtility();
+ utility = new HBaseZKTestingUtil();
utility.startMiniZKCluster();
conf = utility.getConfiguration();
conf.setBoolean(HConstants.REPLICATION_BULKLOAD_ENABLE_KEY, true);
diff --git a/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationPeerStorage.java b/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationPeerStorage.java
index 45539c4..2c20430 100644
--- a/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationPeerStorage.java
+++ b/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationPeerStorage.java
@@ -39,7 +39,7 @@ import java.util.Set;
import java.util.stream.Stream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseZKTestingUtility;
+import org.apache.hadoop.hbase.HBaseZKTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.replication.ReplicationPeerConfigUtil;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -60,7 +60,7 @@ public class TestZKReplicationPeerStorage {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestZKReplicationPeerStorage.class);
- private static final HBaseZKTestingUtility UTIL = new HBaseZKTestingUtility();
+ private static final HBaseZKTestingUtil UTIL = new HBaseZKTestingUtil();
private static ZKReplicationPeerStorage STORAGE;
diff --git a/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationQueueStorage.java b/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationQueueStorage.java
index 4f1fd39..5080f6c 100644
--- a/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationQueueStorage.java
+++ b/hbase-replication/src/test/java/org/apache/hadoop/hbase/replication/TestZKReplicationQueueStorage.java
@@ -30,7 +30,7 @@ import java.util.Set;
import java.util.SortedSet;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseZKTestingUtility;
+import org.apache.hadoop.hbase.HBaseZKTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -56,7 +56,7 @@ public class TestZKReplicationQueueStorage {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestZKReplicationQueueStorage.class);
- private static final HBaseZKTestingUtility UTIL = new HBaseZKTestingUtility();
+ private static final HBaseZKTestingUtil UTIL = new HBaseZKTestingUtil();
private static ZKReplicationQueueStorage STORAGE;
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 1ef4413..b8c6c34 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -202,6 +202,10 @@
<artifactId>hbase-testing-util</artifactId>
<scope>test</scope>
<exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-server</artifactId>
+ </exclusion>
<!--This dependency pulls in hadoop-minicluster
which pulls in the below. It messes up
this build at assembly time. See HBASE-22029 -->
@@ -432,7 +436,7 @@
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
+ <artifactId>jersey-server</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -441,17 +445,6 @@
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-core</artifactId>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
</dependency>
<dependency>
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 86289ec..dd309d7 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
@@ -35,7 +35,7 @@ import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -74,7 +74,7 @@ public class RowResourceBase {
protected static final String VALUE_5 = "5";
protected static final String VALUE_6 = "6";
- protected static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
protected static Client client;
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 e6c9c00..11f14f1 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
@@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -63,7 +63,7 @@ public class TestGzipFilter {
private static final String ROW_1 = "testrow1";
private static final byte[] VALUE_1 = Bytes.toBytes("testvalue1");
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
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 0c5fcc4..cf1ef2e 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
@@ -31,8 +31,8 @@ import javax.xml.bind.Unmarshaller;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -76,7 +76,7 @@ public class TestMultiRowResource {
private static final String ROW_2 = "testrow6";
private static final String VALUE_2 = "testvalue6";
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL = new HBaseRESTTestingUtility();
private static Client client;
@@ -90,7 +90,7 @@ public class TestMultiRowResource {
@Parameterized.Parameters
public static Collection<Object[]> data() {
- return HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;
+ return HBaseCommonTestingUtil.BOOLEAN_PARAMETERIZED;
}
public TestMultiRowResource(Boolean csrf) {
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 414168e..233ba33 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
@@ -37,7 +37,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
@@ -77,7 +77,7 @@ public class TestNamespacesInstanceResource {
private static String NAMESPACE4 = "TestNamespacesInstanceResource4";
private static Map<String,String> NAMESPACE4_PROPS = new HashMap<>();
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
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 3d0bfc3..d8729f6 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
@@ -26,7 +26,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.NamespaceDescriptor;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.rest.client.Client;
@@ -52,7 +52,7 @@ public class TestNamespacesResource {
private static String NAMESPACE1 = "TestNamespacesInstanceResource1";
private static String NAMESPACE2 = "TestNamespacesInstanceResource2";
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestRESTServerSSL.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestRESTServerSSL.java
index ea13360..49fdd2f 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestRESTServerSSL.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestRESTServerSSL.java
@@ -26,7 +26,7 @@ import java.security.cert.X509Certificate;
import java.util.Optional;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.http.ssl.KeyStoreTestUtil;
import org.apache.hadoop.hbase.rest.client.Client;
import org.apache.hadoop.hbase.rest.client.Cluster;
@@ -52,7 +52,7 @@ public class TestRESTServerSSL {
private static final String KEY_STORE_PASSWORD = "myKSPassword";
private static final String TRUST_STORE_PASSWORD = "myTSPassword";
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL = new HBaseRESTTestingUtility();
private static Client sslClient;
private static File keyDir;
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java
index ba0390d..7c02943 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestResourceFilter.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.rest;
import static org.junit.Assert.assertEquals;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.rest.client.Client;
import org.apache.hadoop.hbase.rest.client.Cluster;
import org.apache.hadoop.hbase.rest.client.Response;
@@ -39,7 +39,7 @@ public class TestResourceFilter {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestResourceFilter.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
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 bad39f4..95d5550 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
@@ -36,7 +36,7 @@ import javax.xml.bind.Unmarshaller;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -82,7 +82,7 @@ public class TestScannerResource {
private static final String COLUMN_1 = CFA + ":1";
private static final String COLUMN_2 = CFB + ":2";
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
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 e1fcaf8..9f86b58 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
@@ -33,7 +33,7 @@ import javax.xml.bind.Unmarshaller;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.TableName;
@@ -116,7 +116,7 @@ public class TestScannersWithFilters {
Bytes.toBytes("testValueOne"), Bytes.toBytes("testValueTwo")
};
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
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 bc74b27..f7f9def 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
@@ -34,7 +34,7 @@ import javax.xml.bind.Unmarshaller;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -88,7 +88,7 @@ public class TestScannersWithLabels {
private final static String SECRET = "secret";
private static User SUPERUSER;
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL = new HBaseRESTTestingUtility();
private static Client client;
private static JAXBContext context;
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 609ee01..14768f9 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
@@ -29,8 +29,8 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.rest.client.Client;
@@ -63,7 +63,7 @@ public class TestSchemaResource {
private static String TABLE1 = "TestSchemaResource1";
private static String TABLE2 = "TestSchemaResource2";
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
@@ -76,7 +76,7 @@ public class TestSchemaResource {
@Parameterized.Parameters
public static Collection<Object[]> parameters() {
- return HBaseCommonTestingUtility.BOOLEAN_PARAMETERIZED;
+ return HBaseCommonTestingUtil.BOOLEAN_PARAMETERIZED;
}
public TestSchemaResource(Boolean csrf) {
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java
index 47ef053..01bd125 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecureRESTServer.java
@@ -36,9 +36,9 @@ import javax.ws.rs.core.MediaType;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
-import org.apache.hadoop.hbase.StartMiniClusterOption;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
import org.apache.hadoop.hbase.client.Connection;
@@ -111,9 +111,9 @@ public class TestSecureRESTServer {
HBaseClassTestRule.forClass(TestSecureRESTServer.class);
private static final Logger LOG = LoggerFactory.getLogger(TestSecureRESTServer.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST = new HBaseRESTTestingUtility();
- private static MiniHBaseCluster CLUSTER;
+ private static SingleProcessHBaseCluster CLUSTER;
private static final String HOSTNAME = "localhost";
private static final String CLIENT_PRINCIPAL = "client";
@@ -199,7 +199,7 @@ public class TestSecureRESTServer {
restServerKeytab);
// Start HDFS
- TEST_UTIL.startMiniCluster(StartMiniClusterOption.builder()
+ TEST_UTIL.startMiniCluster(StartTestingClusterOption.builder()
.numMasters(1)
.numRegionServers(1)
.numZkServers(1)
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecurityHeadersFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecurityHeadersFilter.java
index 02611df..a741801 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecurityHeadersFilter.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestSecurityHeadersFilter.java
@@ -23,7 +23,7 @@ import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsEqual.equalTo;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.rest.client.Client;
import org.apache.hadoop.hbase.rest.client.Cluster;
import org.apache.hadoop.hbase.rest.client.Response;
@@ -41,7 +41,7 @@ public class TestSecurityHeadersFilter {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestSecurityHeadersFilter.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
index 9209120..b30a276 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java
@@ -28,7 +28,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter;
import org.apache.hadoop.hbase.rest.client.Client;
@@ -57,7 +57,7 @@ public class TestStatusResource {
private static final byte[] META_REGION_NAME = Bytes.toBytes(TableName.META_TABLE_NAME + ",,1");
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
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 0c83a7f..36b2d3d 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
@@ -30,7 +30,7 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
@@ -73,7 +73,7 @@ public class TestTableResource {
private static final int NUM_REGIONS = 4;
private static List<HRegionLocation> regionMap;
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
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 1d4ed42..80ac724 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
@@ -49,7 +49,7 @@ import javax.xml.parsers.SAXParserFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -93,7 +93,7 @@ public class TestTableScan {
private static int expectedRows3;
private static Configuration conf;
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
index bbd5e08..0efe07f 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestVersionResource.java
@@ -29,7 +29,7 @@ import javax.ws.rs.core.MediaType;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.rest.client.Client;
import org.apache.hadoop.hbase.rest.client.Cluster;
import org.apache.hadoop.hbase.rest.client.Response;
@@ -55,7 +55,7 @@ public class TestVersionResource {
private static final Logger LOG = LoggerFactory.getLogger(TestVersionResource.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private static Client client;
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java
index 8bad94d..8e8ba36 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteAdminRetries.java
@@ -30,7 +30,7 @@ import java.io.IOException;
import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.TableDescriptorBuilder;
import org.apache.hadoop.hbase.testclassification.RestTests;
@@ -56,7 +56,7 @@ public class TestRemoteAdminRetries {
private static final int RETRIES = 3;
private static final long MAX_TIME = SLEEP_TIME * (RETRIES - 1);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private RemoteAdmin remoteAdmin;
private Client client;
diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java
index 6338df8..55d6d90 100644
--- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java
+++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteHTableRetries.java
@@ -31,7 +31,7 @@ import java.util.Arrays;
import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.client.Delete;
import org.apache.hadoop.hbase.client.Get;
import org.apache.hadoop.hbase.client.Put;
@@ -59,7 +59,7 @@ public class TestRemoteHTableRetries {
private static final int RETRIES = 3;
private static final long MAX_TIME = SLEEP_TIME * (RETRIES - 1);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final byte[] ROW_1 = Bytes.toBytes("testrow1");
private static final byte[] COLUMN_1 = Bytes.toBytes("a");
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 99104b9..d37c811 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
@@ -31,7 +31,7 @@ import java.util.List;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.Admin;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder;
@@ -101,7 +101,7 @@ public class TestRemoteTable {
private static final long TS_2 = EnvironmentEdgeManager.currentTime();
private static final long TS_1 = TS_2 - ONE_HOUR;
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final HBaseRESTTestingUtility REST_TEST_UTIL =
new HBaseRESTTestingUtility();
private RemoteHTable remoteTable;
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
index d0a735a..512916f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java
@@ -455,7 +455,7 @@ public final class MetaTableAccessor {
* @param maxRows maximum rows to return
* @param visitor Visitor invoked against each row.
*/
- static void scanMeta(Connection connection, @Nullable final byte[] startRow,
+ public static void scanMeta(Connection connection, @Nullable final byte[] startRow,
@Nullable final byte[] stopRow, QueryType type, int maxRows,
final ClientMetaTableAccessor.Visitor visitor) throws IOException {
scanMeta(connection, startRow, stopRow, type, null, maxRows, visitor);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java
index d84dd59..0f68e11 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/AcidGuaranteesTestBase.java
@@ -43,7 +43,7 @@ import org.apache.hbase.thirdparty.com.google.common.collect.Lists;
*/
public abstract class AcidGuaranteesTestBase {
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private AcidGuaranteesTestTool tool = new AcidGuaranteesTestTool();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseClusterInterface.java
similarity index 96%
copy from hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java
copy to hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseClusterInterface.java
index 2b8602d..d43e62b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseClusterInterface.java
@@ -25,14 +25,13 @@ import org.apache.hadoop.hbase.client.RegionInfoBuilder;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.yetus.audience.InterfaceAudience;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.yetus.audience.InterfaceStability;
/**
* This class defines methods that can help with managing HBase clusters
* from unit tests and system tests. There are 3 types of cluster deployments:
* <ul>
- * <li><b>MiniHBaseCluster:</b> each server is run in the same JVM in separate threads,
+ * <li><b>SingleProcessHBaseCluster:</b> each server is run in the same JVM in separate threads,
* used by unit tests</li>
* <li><b>DistributedHBaseCluster:</b> the cluster is pre-deployed, system and integration tests can
* interact with the cluster. </li>
@@ -50,12 +49,12 @@ import org.slf4j.LoggerFactory;
* and some tests will still need to mock stuff and introspect internal state. For those use
* cases from unit tests, or if more control is needed, you can use the subclasses directly.
* In that sense, this class does not abstract away <strong>every</strong> interface that
- * MiniHBaseCluster or DistributedHBaseCluster provide.
+ * SingleProcessHBaseCluster or DistributedHBaseCluster provide.
*/
-@InterfaceAudience.Public
-public abstract class HBaseCluster implements Closeable, Configurable {
- // Log is being used in DistributedHBaseCluster class, hence keeping it as package scope
- static final Logger LOG = LoggerFactory.getLogger(HBaseCluster.class.getName());
+@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.PHOENIX)
+@InterfaceStability.Evolving
+public abstract class HBaseClusterInterface implements Closeable, Configurable {
+
protected Configuration conf;
/** the status of the cluster before we begin */
@@ -65,7 +64,7 @@ public abstract class HBaseCluster implements Closeable, Configurable {
* Construct an HBaseCluster
* @param conf Configuration to be used for cluster
*/
- public HBaseCluster(Configuration conf) {
+ public HBaseClusterInterface(Configuration conf) {
setConf(conf);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java
similarity index 93%
copy from hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
copy to hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java
index 249d337..1979732 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/HBaseTestingUtil.java
@@ -146,6 +146,7 @@ import org.apache.hadoop.mapred.MiniMRCluster;
import org.apache.hadoop.mapred.TaskLog;
import org.apache.hadoop.minikdc.MiniKdc;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.ZooKeeper.States;
@@ -160,7 +161,7 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
* Create an instance and keep it around testing HBase. This class is
* meant to be your one-stop shop for anything you might need testing. Manages
* one cluster at a time only. Managed cluster can be an in-process
- * {@link MiniHBaseCluster}, or a deployed cluster of type {@code DistributedHBaseCluster}.
+ * {@link SingleProcessHBaseCluster}, or a deployed cluster of type {@code DistributedHBaseCluster}.
* Not all methods work with the real cluster.
* Depends on log4j being on classpath and
* hbase-site.xml for logging and test-run configuration. It does not set
@@ -171,9 +172,9 @@ import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
* <p>To preserve test data directories, pass the system property "hbase.testing.preserve.testdir"
* setting it to true.
*/
-@InterfaceAudience.Public
-@SuppressWarnings("deprecation")
-public class HBaseTestingUtility extends HBaseZKTestingUtility {
+@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.PHOENIX)
+@InterfaceStability.Evolving
+public class HBaseTestingUtil extends HBaseZKTestingUtil {
/**
* System property key to get test directory value. Name is as it is because mini dfs has
@@ -198,7 +199,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
private MiniDFSCluster dfsCluster = null;
- private volatile HBaseCluster hbaseCluster = null;
+ private volatile HBaseClusterInterface hbaseCluster = null;
private MiniMRCluster mrCluster = null;
/** If there is a mini cluster running for this testing utility instance. */
@@ -259,7 +260,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
private static List<Object[]> bloomAndCompressionCombinations() {
List<Object[]> configurations = new ArrayList<>();
for (Compression.Algorithm comprAlgo :
- HBaseCommonTestingUtility.COMPRESSION_ALGORITHMS) {
+ HBaseCommonTestingUtil.COMPRESSION_ALGORITHMS) {
for (BloomType bloomType : BloomType.values()) {
configurations.add(new Object[] { comprAlgo, bloomType });
}
@@ -303,7 +304,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* Once {@link #startMiniDFSCluster} is called, either directly or via
* {@link #startMiniCluster()}, tmp data will be written to the DFS directory instead.
*/
- public HBaseTestingUtility() {
+ public HBaseTestingUtil() {
this(HBaseConfiguration.create());
}
@@ -316,7 +317,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
*
* @param conf The configuration to use for further operations
*/
- public HBaseTestingUtility(@Nullable Configuration conf) {
+ public HBaseTestingUtil(@Nullable Configuration conf) {
super(conf);
// a hbase checksum verification failure will cause unit tests to fail
@@ -375,7 +376,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
return super.getConfiguration();
}
- public void setHBaseCluster(HBaseCluster hbaseCluster) {
+ public void setHBaseCluster(HBaseClusterInterface hbaseCluster) {
this.hbaseCluster = hbaseCluster;
}
@@ -762,196 +763,197 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
/**
* Start up a minicluster of hbase, dfs, and zookeeper where WAL's walDir is created separately.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * All other options will use default values, defined in
+ * {@link StartTestingClusterOption.Builder}.
* @param createWALDir Whether to create a new WAL directory.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(boolean createWALDir) throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ public SingleProcessHBaseCluster startMiniCluster(boolean createWALDir) throws Exception {
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.createWALDir(createWALDir).build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numSlaves Slave node number, for both HBase region server and HDFS data node.
* @param createRootDir Whether to create a new root or data directory path.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numSlaves, boolean createRootDir)
+ public SingleProcessHBaseCluster startMiniCluster(int numSlaves, boolean createRootDir)
throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numRegionServers(numSlaves).numDataNodes(numSlaves).createRootDir(createRootDir).build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numSlaves Slave node number, for both HBase region server and HDFS data node.
* @param createRootDir Whether to create a new root or data directory path.
* @param createWALDir Whether to create a new WAL directory.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numSlaves, boolean createRootDir,
+ public SingleProcessHBaseCluster startMiniCluster(int numSlaves, boolean createRootDir,
boolean createWALDir) throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numRegionServers(numSlaves).numDataNodes(numSlaves).createRootDir(createRootDir)
.createWALDir(createWALDir).build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numSlaves Slave node number, for both HBase region server and HDFS data node.
* @param createRootDir Whether to create a new root or data directory path.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numSlaves, boolean createRootDir)
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numSlaves, boolean createRootDir)
throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).numRegionServers(numSlaves).createRootDir(createRootDir)
.numDataNodes(numSlaves).build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numSlaves Slave node number, for both HBase region server and HDFS data node.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numSlaves) throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numSlaves) throws Exception {
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).numRegionServers(numSlaves).numDataNodes(numSlaves).build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numSlaves Slave node number, for both HBase region server and HDFS data node.
* @param dataNodeHosts The hostnames of DataNodes to run on. If not null, its size will overwrite
- * HDFS data node number.
+ * HDFS data node number.
* @param createRootDir Whether to create a new root or data directory path.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numSlaves, String[] dataNodeHosts,
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numSlaves, String[] dataNodeHosts,
boolean createRootDir) throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).numRegionServers(numSlaves).createRootDir(createRootDir)
.numDataNodes(numSlaves).dataNodeHosts(dataNodeHosts).build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numSlaves Slave node number, for both HBase region server and HDFS data node.
* @param dataNodeHosts The hostnames of DataNodes to run on. If not null, its size will overwrite
- * HDFS data node number.
+ * HDFS data node number.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numSlaves, String[] dataNodeHosts)
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numSlaves, String[] dataNodeHosts)
throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).numRegionServers(numSlaves)
.numDataNodes(numSlaves).dataNodeHosts(dataNodeHosts).build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numRegionServers Number of region servers.
* @param numDataNodes Number of datanodes.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numRegionServers, int numDataNodes)
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numRegionServers, int numDataNodes)
throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).numRegionServers(numRegionServers).numDataNodes(numDataNodes)
.build();
return startMiniCluster(option);
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numSlaves Slave node number, for both HBase region server and HDFS data node.
* @param dataNodeHosts The hostnames of DataNodes to run on. If not null, its size will overwrite
- * HDFS data node number.
+ * HDFS data node number.
* @param masterClass The class to use as HMaster, or null for default.
* @param rsClass The class to use as HRegionServer, or null for default.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numSlaves, String[] dataNodeHosts,
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numSlaves, String[] dataNodeHosts,
Class<? extends HMaster> masterClass,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass)
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass)
throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).masterClass(masterClass)
.numRegionServers(numSlaves).rsClass(rsClass)
.numDataNodes(numSlaves).dataNodeHosts(dataNodeHosts)
@@ -960,28 +962,28 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numRegionServers Number of region servers.
* @param numDataNodes Number of datanodes.
* @param dataNodeHosts The hostnames of DataNodes to run on. If not null, its size will overwrite
- * HDFS data node number.
+ * HDFS data node number.
* @param masterClass The class to use as HMaster, or null for default.
* @param rsClass The class to use as HRegionServer, or null for default.
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numRegionServers, int numDataNodes,
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numRegionServers, int numDataNodes,
String[] dataNodeHosts, Class<? extends HMaster> masterClass,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass)
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass)
throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).masterClass(masterClass)
.numRegionServers(numRegionServers).rsClass(rsClass)
.numDataNodes(numDataNodes).dataNodeHosts(dataNodeHosts)
@@ -990,13 +992,13 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
/**
- * Start up a minicluster of hbase, dfs, and zookeeper.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs, and zookeeper. All other options will use default values,
+ * defined in {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numRegionServers Number of region servers.
* @param numDataNodes Number of datanodes.
* @param dataNodeHosts The hostnames of DataNodes to run on. If not null, its size will overwrite
- * HDFS data node number.
+ * HDFS data node number.
* @param masterClass The class to use as HMaster, or null for default.
* @param rsClass The class to use as HRegionServer, or null for default.
* @param createRootDir Whether to create a new root or data directory path.
@@ -1004,16 +1006,16 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* @return The mini HBase cluster created.
* @see #shutdownMiniCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniCluster(StartMiniClusterOption)} instead.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * {@link #startMiniCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniCluster(int numMasters, int numRegionServers, int numDataNodes,
+ public SingleProcessHBaseCluster startMiniCluster(int numMasters, int numRegionServers, int numDataNodes,
String[] dataNodeHosts, Class<? extends HMaster> masterClass,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass, boolean createRootDir,
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass, boolean createRootDir,
boolean createWALDir) throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).masterClass(masterClass)
.numRegionServers(numRegionServers).rsClass(rsClass)
.numDataNodes(numDataNodes).dataNodeHosts(dataNodeHosts)
@@ -1023,26 +1025,26 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
/**
- * Start up a minicluster of hbase, dfs and zookeeper clusters with given slave node number.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Start up a minicluster of hbase, dfs and zookeeper clusters with given slave node number. All
+ * other options will use default values, defined in {@link StartTestingClusterOption.Builder}.
* @param numSlaves slave node number, for both HBase region server and HDFS data node.
- * @see #startMiniCluster(StartMiniClusterOption option)
+ * @see #startMiniCluster(StartTestingClusterOption option)
* @see #shutdownMiniDFSCluster()
*/
- public MiniHBaseCluster startMiniCluster(int numSlaves) throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ public SingleProcessHBaseCluster startMiniCluster(int numSlaves) throws Exception {
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numRegionServers(numSlaves).numDataNodes(numSlaves).build();
return startMiniCluster(option);
}
/**
* Start up a minicluster of hbase, dfs and zookeeper all using default options.
- * Option default value can be found in {@link StartMiniClusterOption.Builder}.
- * @see #startMiniCluster(StartMiniClusterOption option)
+ * Option default value can be found in {@link StartTestingClusterOption.Builder}.
+ * @see #startMiniCluster(StartTestingClusterOption option)
* @see #shutdownMiniDFSCluster()
*/
- public MiniHBaseCluster startMiniCluster() throws Exception {
- return startMiniCluster(StartMiniClusterOption.builder().build());
+ public SingleProcessHBaseCluster startMiniCluster() throws Exception {
+ return startMiniCluster(StartTestingClusterOption.builder().build());
}
/**
@@ -1051,7 +1053,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* subdirectory in a directory under System property test.build.data, to be cleaned up on exit.
* @see #shutdownMiniDFSCluster()
*/
- public MiniHBaseCluster startMiniCluster(StartMiniClusterOption option) throws Exception {
+ public SingleProcessHBaseCluster startMiniCluster(StartTestingClusterOption option) throws Exception {
LOG.info("Starting up minicluster with option: {}", option);
// If we already put up a cluster, fail.
@@ -1085,10 +1087,10 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* Starts up mini hbase cluster. Usually you won't want this. You'll usually want
* {@link #startMiniCluster()}. This is useful when doing stepped startup of clusters.
* @return Reference to the hbase mini hbase cluster.
- * @see #startMiniCluster(StartMiniClusterOption)
+ * @see #startMiniCluster(StartTestingClusterOption)
* @see #shutdownMiniHBaseCluster()
*/
- public MiniHBaseCluster startMiniHBaseCluster(StartMiniClusterOption option)
+ public SingleProcessHBaseCluster startMiniHBaseCluster(StartTestingClusterOption option)
throws IOException, InterruptedException {
// Now do the mini hbase cluster. Set the hbase.rootdir in config.
createRootDir(option.isCreateRootDir());
@@ -1112,7 +1114,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
Log4jUtils.setLogLevel(org.apache.hadoop.hbase.ScheduledChore.class.getName(), "INFO");
Configuration c = new Configuration(this.conf);
- this.hbaseCluster = new MiniHBaseCluster(c, option.getNumMasters(),
+ this.hbaseCluster = new SingleProcessHBaseCluster(c, option.getNumMasters(),
option.getNumAlwaysStandByMasters(), option.getNumRegionServers(), option.getRsPorts(),
option.getMasterClass(), option.getRsClass());
// Populate the master address configuration from mini cluster configuration.
@@ -1131,66 +1133,66 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
getAdmin(); // create immediately the hbaseAdmin
LOG.info("Minicluster is up; activeMaster={}", getHBaseCluster().getMaster());
- return (MiniHBaseCluster) hbaseCluster;
+ return (SingleProcessHBaseCluster) hbaseCluster;
}
/**
* Starts up mini hbase cluster using default options.
- * Default options can be found in {@link StartMiniClusterOption.Builder}.
- * @see #startMiniHBaseCluster(StartMiniClusterOption)
+ * Default options can be found in {@link StartTestingClusterOption.Builder}.
+ * @see #startMiniHBaseCluster(StartTestingClusterOption)
* @see #shutdownMiniHBaseCluster()
*/
- public MiniHBaseCluster startMiniHBaseCluster() throws IOException, InterruptedException {
- return startMiniHBaseCluster(StartMiniClusterOption.builder().build());
+ public SingleProcessHBaseCluster startMiniHBaseCluster() throws IOException, InterruptedException {
+ return startMiniHBaseCluster(StartTestingClusterOption.builder().build());
}
/**
- * Starts up mini hbase cluster.
- * Usually you won't want this. You'll usually want {@link #startMiniCluster()}.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Starts up mini hbase cluster. Usually you won't want this. You'll usually want
+ * {@link #startMiniCluster()}. All other options will use default values, defined in
+ * {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numRegionServers Number of region servers.
* @return The mini HBase cluster created.
* @see #shutdownMiniHBaseCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniHBaseCluster(StartMiniClusterOption)} instead.
- * @see #startMiniHBaseCluster(StartMiniClusterOption)
+ * {@link #startMiniHBaseCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniHBaseCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniHBaseCluster(int numMasters, int numRegionServers)
+ public SingleProcessHBaseCluster startMiniHBaseCluster(int numMasters, int numRegionServers)
throws IOException, InterruptedException {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).numRegionServers(numRegionServers).build();
return startMiniHBaseCluster(option);
}
/**
- * Starts up mini hbase cluster.
- * Usually you won't want this. You'll usually want {@link #startMiniCluster()}.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Starts up mini hbase cluster. Usually you won't want this. You'll usually want
+ * {@link #startMiniCluster()}. All other options will use default values, defined in
+ * {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numRegionServers Number of region servers.
* @param rsPorts Ports that RegionServer should use.
* @return The mini HBase cluster created.
* @see #shutdownMiniHBaseCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniHBaseCluster(StartMiniClusterOption)} instead.
- * @see #startMiniHBaseCluster(StartMiniClusterOption)
+ * {@link #startMiniHBaseCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniHBaseCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniHBaseCluster(int numMasters, int numRegionServers,
+ public SingleProcessHBaseCluster startMiniHBaseCluster(int numMasters, int numRegionServers,
List<Integer> rsPorts) throws IOException, InterruptedException {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).numRegionServers(numRegionServers).rsPorts(rsPorts).build();
return startMiniHBaseCluster(option);
}
/**
- * Starts up mini hbase cluster.
- * Usually you won't want this. You'll usually want {@link #startMiniCluster()}.
- * All other options will use default values, defined in {@link StartMiniClusterOption.Builder}.
+ * Starts up mini hbase cluster. Usually you won't want this. You'll usually want
+ * {@link #startMiniCluster()}. All other options will use default values, defined in
+ * {@link StartTestingClusterOption.Builder}.
* @param numMasters Master node number.
* @param numRegionServers Number of region servers.
* @param rsPorts Ports that RegionServer should use.
@@ -1201,16 +1203,16 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* @return The mini HBase cluster created.
* @see #shutdownMiniHBaseCluster()
* @deprecated since 2.2.0 and will be removed in 4.0.0. Use
- * {@link #startMiniHBaseCluster(StartMiniClusterOption)} instead.
- * @see #startMiniHBaseCluster(StartMiniClusterOption)
+ * {@link #startMiniHBaseCluster(StartTestingClusterOption)} instead.
+ * @see #startMiniHBaseCluster(StartTestingClusterOption)
* @see <a href="https://issues.apache.org/jira/browse/HBASE-21071">HBASE-21071</a>
*/
@Deprecated
- public MiniHBaseCluster startMiniHBaseCluster(int numMasters, int numRegionServers,
+ public SingleProcessHBaseCluster startMiniHBaseCluster(int numMasters, int numRegionServers,
List<Integer> rsPorts, Class<? extends HMaster> masterClass,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass,
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass,
boolean createRootDir, boolean createWALDir) throws IOException, InterruptedException {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(numMasters).masterClass(masterClass)
.numRegionServers(numRegionServers).rsClass(rsClass).rsPorts(rsPorts)
.createRootDir(createRootDir).createWALDir(createWALDir).build();
@@ -1228,19 +1230,18 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
public void restartHBaseCluster(int servers, List<Integer> ports)
throws IOException, InterruptedException {
- StartMiniClusterOption option =
- StartMiniClusterOption.builder().numRegionServers(servers).rsPorts(ports).build();
+ StartTestingClusterOption option =
+ StartTestingClusterOption.builder().numRegionServers(servers).rsPorts(ports).build();
restartHBaseCluster(option);
invalidateConnection();
}
- public void restartHBaseCluster(StartMiniClusterOption option)
- throws IOException, InterruptedException {
+ public void restartHBaseCluster(StartTestingClusterOption option)
+ throws IOException, InterruptedException {
closeConnection();
- this.hbaseCluster =
- new MiniHBaseCluster(this.conf, option.getNumMasters(), option.getNumAlwaysStandByMasters(),
- option.getNumRegionServers(), option.getRsPorts(), option.getMasterClass(),
- option.getRsClass());
+ this.hbaseCluster = new SingleProcessHBaseCluster(this.conf, option.getNumMasters(),
+ option.getNumAlwaysStandByMasters(), option.getNumRegionServers(), option.getRsPorts(),
+ option.getMasterClass(), option.getRsClass());
// Don't leave here till we've done a successful scan of the hbase:meta
Connection conn = ConnectionFactory.createConnection(this.conf);
Table t = conn.getTable(TableName.META_TABLE_NAME);
@@ -1259,12 +1260,12 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* to {@link #startMiniCluster()}.
* @see #startMiniCluster()
*/
- public MiniHBaseCluster getMiniHBaseCluster() {
- if (this.hbaseCluster == null || this.hbaseCluster instanceof MiniHBaseCluster) {
- return (MiniHBaseCluster)this.hbaseCluster;
+ public SingleProcessHBaseCluster getMiniHBaseCluster() {
+ if (this.hbaseCluster == null || this.hbaseCluster instanceof SingleProcessHBaseCluster) {
+ return (SingleProcessHBaseCluster)this.hbaseCluster;
}
throw new RuntimeException(hbaseCluster + " not an instance of " +
- MiniHBaseCluster.class.getName());
+ SingleProcessHBaseCluster.class.getName());
}
/**
@@ -1341,7 +1342,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
/**
- * Same as {{@link HBaseTestingUtility#getDefaultRootDirPath(boolean create)}
+ * Same as {{@link HBaseTestingUtil#getDefaultRootDirPath(boolean create)}
* except that <code>create</code> flag is false.
* Note: this does not cause the root dir to be created.
* @return Fully qualified path for the default hbase root dir
@@ -1373,7 +1374,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
/**
- * Same as {@link HBaseTestingUtility#createRootDir(boolean create)}
+ * Same as {@link HBaseTestingUtil#createRootDir(boolean create)}
* except that <code>create</code> flag is false.
* @return Fully qualified path to hbase root dir
* @throws IOException
@@ -1968,7 +1969,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
/**
* Create an HRegion that writes to the local tmp dirs. Creates the WAL for you. Be sure to call
- * {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} when you're finished with it.
+ * {@link HBaseTestingUtil#closeRegionAndWAL(HRegion)} when you're finished with it.
*/
public HRegion createLocalHRegion(RegionInfo info, TableDescriptor desc) throws IOException {
return createRegionAndWAL(info, getDataTestDir(), getConfiguration(), desc);
@@ -1995,7 +1996,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* @param isReadOnly
* @param families
* @return A region on which you must call
- * {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} when done.
+ * {@link HBaseTestingUtil#closeRegionAndWAL(HRegion)} when done.
* @throws IOException
*/
public HRegion createLocalHRegion(TableName tableName, byte[] startKey, byte[] stopKey,
@@ -2139,7 +2140,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
public int loadTable(final Table t, final byte[][] f, byte[] value,
boolean writeToWAL) throws IOException {
List<Put> puts = new ArrayList<>();
- for (byte[] row : HBaseTestingUtility.ROWS) {
+ for (byte[] row : HBaseTestingUtil.ROWS) {
Put put = new Put(row);
put.setDurability(writeToWAL ? Durability.USE_DEFAULT : Durability.SKIP_WAL);
for (int i = 0; i < f.length; i++) {
@@ -2153,7 +2154,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
/** A tracker for tracking and validating table rows
- * generated with {@link HBaseTestingUtility#loadTable(Table, byte[])}
+ * generated with {@link HBaseTestingUtil#loadTable(Table, byte[])}
*/
public static class SeenRowTracker {
int dim = 'z' - 'a' + 1;
@@ -2510,7 +2511,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
/**
* Create a region with it's own WAL. Be sure to call
- * {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} to clean up all resources.
+ * {@link HBaseTestingUtil#closeRegionAndWAL(HRegion)} to clean up all resources.
*/
public static HRegion createRegionAndWAL(final RegionInfo info, final Path rootDir,
final Configuration conf, final TableDescriptor htd) throws IOException {
@@ -2519,7 +2520,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
/**
* Create a region with it's own WAL. Be sure to call
- * {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} to clean up all resources.
+ * {@link HBaseTestingUtil#closeRegionAndWAL(HRegion)} to clean up all resources.
*/
public static HRegion createRegionAndWAL(final RegionInfo info, final Path rootDir,
final Configuration conf, final TableDescriptor htd, BlockCache blockCache)
@@ -2531,7 +2532,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
/**
* Create a region with it's own WAL. Be sure to call
- * {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} to clean up all resources.
+ * {@link HBaseTestingUtil#closeRegionAndWAL(HRegion)} to clean up all resources.
*/
public static HRegion createRegionAndWAL(final RegionInfo info, final Path rootDir,
final Configuration conf, final TableDescriptor htd, MobFileCache mobFileCache)
@@ -2544,7 +2545,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
/**
* Create a region with it's own WAL. Be sure to call
- * {@link HBaseTestingUtility#closeRegionAndWAL(HRegion)} to clean up all resources.
+ * {@link HBaseTestingUtil#closeRegionAndWAL(HRegion)} to clean up all resources.
*/
public static HRegion createRegionAndWAL(final RegionInfo info, final Path rootDir,
final Configuration conf, final TableDescriptor htd, boolean initialize)
@@ -2945,7 +2946,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* @return hbase cluster
* @see #getHBaseClusterInterface()
*/
- public MiniHBaseCluster getHBaseCluster() {
+ public SingleProcessHBaseCluster getHBaseCluster() {
return getMiniHBaseCluster();
}
@@ -2957,7 +2958,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* method {@link #getMiniHBaseCluster()} can be used instead w/o the
* need to type-cast.
*/
- public HBaseCluster getHBaseClusterInterface() {
+ public HBaseClusterInterface getHBaseClusterInterface() {
//implementation note: we should rename this method as #getHBaseCluster(),
//but this would require refactoring 90+ calls.
return hbaseCluster;
@@ -2976,11 +2977,11 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
closeConnection();
// Update the master addresses if they changed.
final String masterConfigBefore = conf.get(HConstants.MASTER_ADDRS_KEY);
- final String masterConfAfter = getMiniHBaseCluster().conf.get(HConstants.MASTER_ADDRS_KEY);
+ final String masterConfAfter = getMiniHBaseCluster().getConf().get(HConstants.MASTER_ADDRS_KEY);
LOG.info("Invalidated connection. Updating master addresses before: {} after: {}",
masterConfigBefore, masterConfAfter);
conf.set(HConstants.MASTER_ADDRS_KEY,
- getMiniHBaseCluster().conf.get(HConstants.MASTER_ADDRS_KEY));
+ getMiniHBaseCluster().getConf().get(HConstants.MASTER_ADDRS_KEY));
}
/**
@@ -3050,7 +3051,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
* Returns an Admin instance which is shared between HBaseTestingUtility instance users.
* Closing it has no effect, it will be closed automatically when the cluster shutdowns
*/
- public synchronized Admin getAdmin() throws IOException {
+ public Admin getAdmin() throws IOException {
if (hbaseAdmin == null){
this.hbaseAdmin = getConnection().getAdmin();
}
@@ -3201,7 +3202,8 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
public String explainTableAvailability(TableName tableName) throws IOException {
- String msg = explainTableState(tableName, TableState.State.ENABLED) + ", ";
+ StringBuilder msg =
+ new StringBuilder(explainTableState(tableName, TableState.State.ENABLED)).append(", ");
if (getHBaseCluster().getMaster().isAlive()) {
Map<RegionInfo, ServerName> assignments = getHBaseCluster().getMaster().getAssignmentManager()
.getRegionStates().getRegionAssignments();
@@ -3211,17 +3213,18 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
RegionInfo hri = metaLocation.getFirst();
ServerName sn = metaLocation.getSecond();
if (!assignments.containsKey(hri)) {
- msg += ", region " + hri + " not assigned, but found in meta, it expected to be on " + sn;
-
+ msg.append(", region ").append(hri)
+ .append(" not assigned, but found in meta, it expected to be on ").append(sn);
} else if (sn == null) {
- msg += ", region " + hri + " assigned, but has no server in meta";
+ msg.append(", region ").append(hri).append(" assigned, but has no server in meta");
} else if (!sn.equals(assignments.get(hri))) {
- msg += ", region " + hri + " assigned, but has different servers in meta and AM ( " +
- sn + " <> " + assignments.get(hri);
+ msg.append(", region ").append(hri)
+ .append(" assigned, but has different servers in meta and AM ( ").append(sn)
+ .append(" <> ").append(assignments.get(hri));
}
}
}
- return msg;
+ return msg.toString();
}
public String explainTableState(final TableName table, TableState.State state)
@@ -3329,7 +3332,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
public boolean ensureSomeRegionServersAvailable(final int num)
throws IOException {
boolean startedServer = false;
- MiniHBaseCluster hbaseCluster = getMiniHBaseCluster();
+ SingleProcessHBaseCluster hbaseCluster = getMiniHBaseCluster();
for (int i=hbaseCluster.getLiveRegionServerThreads().size(); i<num; ++i) {
LOG.info("Started new server=" + hbaseCluster.startRegionServer());
startedServer = true;
@@ -3395,7 +3398,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
return user;
}
- public static NavigableSet<String> getAllOnlineRegions(MiniHBaseCluster cluster)
+ public static NavigableSet<String> getAllOnlineRegions(SingleProcessHBaseCluster cluster)
throws IOException {
NavigableSet<String> online = new TreeSet<>();
for (RegionServerThread rst : cluster.getLiveRegionServerThreads()) {
@@ -3791,7 +3794,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
}
public static int randomFreePort() {
- return HBaseCommonTestingUtility.randomFreePort();
+ return HBaseCommonTestingUtil.randomFreePort();
}
public static String randomMultiCastAddress() {
return "226.1.1." + random.nextInt(254);
@@ -4035,7 +4038,7 @@ public class HBaseTestingUtility extends HBaseZKTestingUtility {
return createRegionAndWAL(info, getDataTestDir(), getConfiguration(), td, blockCache);
}
- public void setFileSystemURI(String fsURI) {
+ public static void setFileSystemURI(String fsURI) {
FS_URI = fsURI;
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java
index 4ee068f..099b82b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniClusterRule.java
@@ -28,22 +28,25 @@ import org.junit.rules.ExternalResource;
import org.junit.rules.TestRule;
/**
- * A {@link TestRule} that manages an instance of the {@link MiniHBaseCluster}. Can be used in
- * either the {@link Rule} or {@link ClassRule} positions. Built on top of an instance of
- * {@link HBaseTestingUtility}, so be weary of intermixing direct use of that class with this Rule.
+ * A {@link TestRule} that manages an instance of the {@link SingleProcessHBaseCluster}. Can be used
+ * in either the {@link Rule} or {@link ClassRule} positions. Built on top of an instance of
+ * {@link HBaseTestingUtil}, so be weary of intermixing direct use of that class with this Rule.
* </p>
* Use in combination with {@link ConnectionRule}, for example:
*
- * <pre>{@code
+ * <pre>
+ * {
+ * @code
* public class TestMyClass {
- * @ClassRule
+ * @ClassRule
* public static final MiniClusterRule miniClusterRule = MiniClusterRule.newBuilder().build();
*
- * @Rule
+ * @Rule
* public final ConnectionRule connectionRule =
* new ConnectionRule(miniClusterRule::createConnection);
* }
- * }</pre>
+ * }
+ * </pre>
*/
public final class MiniClusterRule extends ExternalResource {
@@ -52,19 +55,20 @@ public final class MiniClusterRule extends ExternalResource {
*/
public static class Builder {
- private StartMiniClusterOption miniClusterOption;
+ private StartTestingClusterOption miniClusterOption;
private Configuration conf;
/**
- * Use the provided {@link StartMiniClusterOption} to construct the {@link MiniHBaseCluster}.
+ * Use the provided {@link StartTestingClusterOption} to construct the
+ * {@link SingleProcessHBaseCluster}.
*/
- public Builder setMiniClusterOption(final StartMiniClusterOption miniClusterOption) {
+ public Builder setMiniClusterOption(final StartTestingClusterOption miniClusterOption) {
this.miniClusterOption = miniClusterOption;
return this;
}
/**
- * Seed the underlying {@link HBaseTestingUtility} with the provided {@link Configuration}.
+ * Seed the underlying {@link HBaseTestingUtil} with the provided {@link Configuration}.
*/
public Builder setConfiguration(final Configuration conf) {
this.conf = conf;
@@ -72,22 +76,19 @@ public final class MiniClusterRule extends ExternalResource {
}
public MiniClusterRule build() {
- return new MiniClusterRule(
- conf,
- miniClusterOption != null
- ? miniClusterOption
- : StartMiniClusterOption.builder().build());
+ return new MiniClusterRule(conf, miniClusterOption != null ? miniClusterOption :
+ StartTestingClusterOption.builder().build());
}
}
- private final HBaseTestingUtility testingUtility;
- private final StartMiniClusterOption miniClusterOptions;
+ private final HBaseTestingUtil testingUtility;
+ private final StartTestingClusterOption miniClusterOptions;
- private MiniHBaseCluster miniCluster;
+ private SingleProcessHBaseCluster miniCluster;
private MiniClusterRule(final Configuration conf,
- final StartMiniClusterOption miniClusterOptions) {
- this.testingUtility = new HBaseTestingUtility(conf);
+ final StartTestingClusterOption miniClusterOptions) {
+ this.testingUtility = new HBaseTestingUtil(conf);
this.miniClusterOptions = miniClusterOptions;
}
@@ -96,15 +97,15 @@ public final class MiniClusterRule extends ExternalResource {
}
/**
- * @return the underlying instance of {@link HBaseTestingUtility}
+ * @return the underlying instance of {@link HBaseTestingUtil}
*/
- public HBaseTestingUtility getTestingUtility() {
+ public HBaseTestingUtil getTestingUtility() {
return testingUtility;
}
/**
- * Create a {@link AsyncConnection} to the managed {@link MiniHBaseCluster}. It's up to the caller
- * to {@link AsyncConnection#close() close()} the connection when finished.
+ * Create a {@link AsyncConnection} to the managed {@link SingleProcessHBaseCluster}. It's up to
+ * the caller to {@link AsyncConnection#close() close()} the connection when finished.
*/
public CompletableFuture<AsyncConnection> createConnection() {
if (miniCluster == null) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java
index f0a85b5..82f7a85 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java
@@ -84,17 +84,17 @@ public class MockRegionServerServices implements RegionServerServices {
private volatile boolean stopping = false;
private final AtomicBoolean running = new AtomicBoolean(true);
- MockRegionServerServices(ZKWatcher zkw) {
+ public MockRegionServerServices(ZKWatcher zkw) {
this(zkw, null);
}
- MockRegionServerServices(ZKWatcher zkw, ServerName serverName) {
+ public MockRegionServerServices(ZKWatcher zkw, ServerName serverName) {
this.zkw = zkw;
this.serverName = serverName;
this.conf = (zkw == null ? new Configuration() : zkw.getConfiguration());
}
- MockRegionServerServices(){
+ public MockRegionServerServices(){
this(null, null);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/ProcedureTestUtil.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/ProcedureTestUtil.java
index ff23d85..b4ba729 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/ProcedureTestUtil.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/ProcedureTestUtil.java
@@ -38,7 +38,7 @@ public final class ProcedureTestUtil {
private ProcedureTestUtil() {
}
- private static Optional<JsonObject> getProcedure(HBaseTestingUtility util,
+ private static Optional<JsonObject> getProcedure(HBaseTestingUtil util,
Class<? extends Procedure<?>> clazz, JsonParser parser) throws IOException {
JsonArray array = parser.parse(util.getAdmin().getProcedures()).getAsJsonArray();
Iterator<JsonElement> iterator = array.iterator();
@@ -53,7 +53,7 @@ public final class ProcedureTestUtil {
return Optional.empty();
}
- public static void waitUntilProcedureWaitingTimeout(HBaseTestingUtility util,
+ public static void waitUntilProcedureWaitingTimeout(HBaseTestingUtil util,
Class<? extends Procedure<?>> clazz, long timeout) throws IOException {
JsonParser parser = new JsonParser();
util.waitFor(timeout,
@@ -62,7 +62,7 @@ public final class ProcedureTestUtil {
.isPresent());
}
- public static void waitUntilProcedureTimeoutIncrease(HBaseTestingUtility util,
+ public static void waitUntilProcedureTimeoutIncrease(HBaseTestingUtil util,
Class<? extends Procedure<?>> clazz, int times) throws IOException, InterruptedException {
JsonParser parser = new JsonParser();
long oldTimeout = 0;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/SingleProcessHBaseCluster.java
similarity index 88%
copy from hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
copy to hbase-server/src/test/java/org/apache/hadoop/hbase/SingleProcessHBaseCluster.java
index 990867e..dc899e0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/SingleProcessHBaseCluster.java
@@ -40,6 +40,7 @@ import org.apache.hadoop.hbase.util.JVMClusterUtil.MasterThread;
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -51,9 +52,11 @@ import org.apache.hadoop.hbase.shaded.protobuf.generated.RegionServerStatusProto
* if we are running on DistributedFilesystem, create a FileSystem instance
* each and will close down their instance on the way out.
*/
-@InterfaceAudience.Public
-public class MiniHBaseCluster extends HBaseCluster {
- private static final Logger LOG = LoggerFactory.getLogger(MiniHBaseCluster.class.getName());
+@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.PHOENIX)
+@InterfaceStability.Evolving
+public class SingleProcessHBaseCluster extends HBaseClusterInterface {
+ private static final Logger LOG =
+ LoggerFactory.getLogger(SingleProcessHBaseCluster.class.getName());
public LocalHBaseCluster hbaseCluster;
private static int index;
@@ -61,10 +64,9 @@ public class MiniHBaseCluster extends HBaseCluster {
* Start a MiniHBaseCluster.
* @param conf Configuration to be used for cluster
* @param numRegionServers initial number of region servers to start.
- * @throws IOException
*/
- public MiniHBaseCluster(Configuration conf, int numRegionServers)
- throws IOException, InterruptedException {
+ public SingleProcessHBaseCluster(Configuration conf, int numRegionServers)
+ throws IOException, InterruptedException {
this(conf, 1, numRegionServers);
}
@@ -73,10 +75,9 @@ public class MiniHBaseCluster extends HBaseCluster {
* @param conf Configuration to be used for cluster
* @param numMasters initial number of masters to start.
* @param numRegionServers initial number of region servers to start.
- * @throws IOException
*/
- public MiniHBaseCluster(Configuration conf, int numMasters, int numRegionServers)
- throws IOException, InterruptedException {
+ public SingleProcessHBaseCluster(Configuration conf, int numMasters, int numRegionServers)
+ throws IOException, InterruptedException {
this(conf, numMasters, numRegionServers, null, null);
}
@@ -86,24 +87,22 @@ public class MiniHBaseCluster extends HBaseCluster {
* @param numMasters initial number of masters to start.
* @param numRegionServers initial number of region servers to start.
*/
- public MiniHBaseCluster(Configuration conf, int numMasters, int numRegionServers,
- Class<? extends HMaster> masterClass,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)
- throws IOException, InterruptedException {
+ public SingleProcessHBaseCluster(Configuration conf, int numMasters, int numRegionServers,
+ Class<? extends HMaster> masterClass,
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)
+ throws IOException, InterruptedException {
this(conf, numMasters, 0, numRegionServers, null, masterClass, regionserverClass);
}
/**
* @param rsPorts Ports that RegionServer should use; pass ports if you want to test cluster
- * restart where for sure the regionservers come up on same address+port (but
- * just with different startcode); by default mini hbase clusters choose new
- * arbitrary ports on each cluster start.
- * @throws IOException
- * @throws InterruptedException
+ * restart where for sure the regionservers come up on same address+port (but just with
+ * different startcode); by default mini hbase clusters choose new arbitrary ports on
+ * each cluster start.
*/
- public MiniHBaseCluster(Configuration conf, int numMasters, int numAlwaysStandByMasters,
+ public SingleProcessHBaseCluster(Configuration conf, int numMasters, int numAlwaysStandByMasters,
int numRegionServers, List<Integer> rsPorts, Class<? extends HMaster> masterClass,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)
throws IOException, InterruptedException {
super(conf);
@@ -141,14 +140,6 @@ public class MiniHBaseCluster extends HBaseCluster {
this.user = User.getCurrent();
}
- /*
- * @param c
- * @param currentfs We return this if we did not make a new one.
- * @param uniqueName Same name used to help identify the created fs.
- * @return A new fs instance if we are up on DistributeFileSystem.
- * @throws IOException
- */
-
@Override
protected void handleReportForDutyResponse(
final RegionServerStartupResponse c) throws IOException {
@@ -228,15 +219,15 @@ public class MiniHBaseCluster extends HBaseCluster {
}
private void init(final int nMasterNodes, final int numAlwaysStandByMasters,
- final int nRegionNodes, List<Integer> rsPorts, Class<? extends HMaster> masterClass,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)
- throws IOException, InterruptedException {
+ final int nRegionNodes, List<Integer> rsPorts, Class<? extends HMaster> masterClass,
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> regionserverClass)
+ throws IOException, InterruptedException {
try {
- if (masterClass == null){
- masterClass = HMaster.class;
+ if (masterClass == null) {
+ masterClass = HMaster.class;
}
- if (regionserverClass == null){
- regionserverClass = MiniHBaseCluster.MiniHBaseClusterRegionServer.class;
+ if (regionserverClass == null) {
+ regionserverClass = SingleProcessHBaseCluster.MiniHBaseClusterRegionServer.class;
}
// start up a LocalHBaseCluster
@@ -249,7 +240,7 @@ public class MiniHBaseCluster extends HBaseCluster {
if (rsPorts != null) {
rsConf.setInt(HConstants.REGIONSERVER_PORT, rsPorts.get(i));
}
- User user = HBaseTestingUtility.getDifferentUser(rsConf,
+ User user = HBaseTestingUtil.getDifferentUser(rsConf,
".hfs."+index++);
hbaseCluster.addRegionServer(rsConf, i, user);
}
@@ -407,8 +398,6 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Starts a region server thread running
- *
- * @throws IOException
* @return New RegionServerThread
*/
public JVMClusterUtil.RegionServerThread startRegionServer()
@@ -420,7 +409,7 @@ public class MiniHBaseCluster extends HBaseCluster {
private JVMClusterUtil.RegionServerThread startRegionServer(Configuration configuration)
throws IOException {
User rsUser =
- HBaseTestingUtility.getDifferentUser(configuration, ".hfs."+index++);
+ HBaseTestingUtil.getDifferentUser(configuration, ".hfs."+index++);
JVMClusterUtil.RegionServerThread t = null;
try {
t = hbaseCluster.addRegionServer(
@@ -484,12 +473,10 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Shut down the specified region server cleanly
- *
- * @param serverNumber Used as index into a list.
- * @param shutdownFS True is we are to shutdown the filesystem as part of this
- * regionserver's shutdown. Usually we do but you do not want to do this if
- * you are running multiple regionservers in a test and you shut down one
- * before end of the test.
+ * @param serverNumber Used as index into a list.
+ * @param shutdownFS True is we are to shutdown the filesystem as part of this regionserver's
+ * shutdown. Usually we do but you do not want to do this if you are running multiple
+ * regionservers in a test and you shut down one before end of the test.
* @return the region server that was stopped
*/
public JVMClusterUtil.RegionServerThread stopRegionServer(int serverNumber,
@@ -504,7 +491,6 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Suspend the specified region server
* @param serverNumber Used as index into a list.
- * @return
*/
public JVMClusterUtil.RegionServerThread suspendRegionServer(int serverNumber) {
JVMClusterUtil.RegionServerThread server =
@@ -517,7 +503,6 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Resume the specified region server
* @param serverNumber Used as index into a list.
- * @return
*/
public JVMClusterUtil.RegionServerThread resumeRegionServer(int serverNumber) {
JVMClusterUtil.RegionServerThread server =
@@ -528,9 +513,7 @@ public class MiniHBaseCluster extends HBaseCluster {
}
/**
- * Wait for the specified region server to stop. Removes this thread from list
- * of running threads.
- * @param serverNumber
+ * Wait for the specified region server to stop. Removes this thread from list of running threads.
* @return Name of region server that just went down.
*/
public String waitOnRegionServer(final int serverNumber) {
@@ -546,7 +529,7 @@ public class MiniHBaseCluster extends HBaseCluster {
public JVMClusterUtil.MasterThread startMaster() throws IOException {
Configuration c = HBaseConfiguration.create(conf);
User user =
- HBaseTestingUtility.getDifferentUser(c, ".hfs."+index++);
+ HBaseTestingUtil.getDifferentUser(c, ".hfs."+index++);
JVMClusterUtil.MasterThread t = null;
try {
@@ -612,12 +595,10 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Shut down the specified master cleanly
- *
- * @param serverNumber Used as index into a list.
- * @param shutdownFS True is we are to shutdown the filesystem as part of this
- * master's shutdown. Usually we do but you do not want to do this if
- * you are running multiple master in a test and you shut down one
- * before end of the test.
+ * @param serverNumber Used as index into a list.
+ * @param shutdownFS True is we are to shutdown the filesystem as part of this master's shutdown.
+ * Usually we do but you do not want to do this if you are running multiple master in a
+ * test and you shut down one before end of the test.
* @return the master that was stopped
*/
public JVMClusterUtil.MasterThread stopMaster(int serverNumber,
@@ -630,9 +611,7 @@ public class MiniHBaseCluster extends HBaseCluster {
}
/**
- * Wait for the specified master to stop. Removes this thread from list
- * of running threads.
- * @param serverNumber
+ * Wait for the specified master to stop. Removes this thread from list of running threads.
* @return Name of master that just went down.
*/
public String waitOnMaster(final int serverNumber) {
@@ -645,7 +624,6 @@ public class MiniHBaseCluster extends HBaseCluster {
*
* @return true if an active master becomes available. false if there are no
* masters left.
- * @throws InterruptedException
*/
@Override
public boolean waitForActiveAndReadyMaster(long timeout) throws IOException {
@@ -665,14 +643,14 @@ public class MiniHBaseCluster extends HBaseCluster {
}
/**
- * @return List of master threads.
+ * Returns list of master threads.
*/
public List<JVMClusterUtil.MasterThread> getMasterThreads() {
return this.hbaseCluster.getMasters();
}
/**
- * @return List of live master threads (skips the aborted and the killed)
+ * Returns list of live master threads (skips the aborted and the killed)
*/
public List<JVMClusterUtil.MasterThread> getLiveMasterThreads() {
return this.hbaseCluster.getLiveMasters();
@@ -742,7 +720,6 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Call flushCache on all regions on all participating regionservers.
- * @throws IOException
*/
public void compact(boolean major) throws IOException {
for (JVMClusterUtil.RegionServerThread t:
@@ -755,7 +732,6 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Call flushCache on all regions of the specified table.
- * @throws IOException
*/
public void compact(TableName tableName, boolean major) throws IOException {
for (JVMClusterUtil.RegionServerThread t:
@@ -769,15 +745,15 @@ public class MiniHBaseCluster extends HBaseCluster {
}
/**
- * @return Number of live region servers in the cluster currently.
+ * Returns number of live region servers in the cluster currently.
*/
public int getNumLiveRegionServers() {
return this.hbaseCluster.getLiveRegionServers().size();
}
/**
- * @return List of region server threads. Does not return the master even though it is also
- * a region server.
+ * Returns list of region server threads. Does not return the master even though it is also a
+ * region server.
*/
public List<JVMClusterUtil.RegionServerThread> getRegionServerThreads() {
return this.hbaseCluster.getRegionServers();
@@ -792,7 +768,6 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Grab a numbered region server of your choice.
- * @param serverNumber
* @return region server
*/
public HRegionServer getRegionServer(int serverNumber) {
@@ -824,8 +799,8 @@ public class MiniHBaseCluster extends HBaseCluster {
}
/**
- * @return Index into List of {@link MiniHBaseCluster#getRegionServerThreads()}
- * of HRS carrying regionName. Returns -1 if none found.
+ * Returns index into List of {@link SingleProcessHBaseCluster#getRegionServerThreads()} of HRS
+ * carrying regionName. Returns -1 if none found.
*/
public int getServerWithMeta() {
return getServerWith(RegionInfoBuilder.FIRST_META_REGIONINFO.getRegionName());
@@ -834,7 +809,7 @@ public class MiniHBaseCluster extends HBaseCluster {
/**
* Get the location of the specified region
* @param regionName Name of the region in bytes
- * @return Index into List of {@link MiniHBaseCluster#getRegionServerThreads()}
+ * @return Index into List of {@link SingleProcessHBaseCluster#getRegionServerThreads()}
* of HRS carrying hbase:meta. Returns -1 if none found.
*/
public int getServerWith(byte[] regionName) {
@@ -854,7 +829,7 @@ public class MiniHBaseCluster extends HBaseCluster {
@Override
public ServerName getServerHoldingRegion(final TableName tn, byte[] regionName)
- throws IOException {
+ throws IOException {
// Assume there is only one master thread which is the active master.
// If there are multiple master threads, the backup master threads
// should hold some regions. Please refer to #countServedRegions
@@ -872,9 +847,9 @@ public class MiniHBaseCluster extends HBaseCluster {
}
/**
- * Counts the total numbers of regions being served by the currently online
- * region servers by asking each how many regions they have. Does not look
- * at hbase:meta at all. Count includes catalog tables.
+ * Counts the total numbers of regions being served by the currently online region servers by
+ * asking each how many regions they have. Does not look at hbase:meta at all. Count includes
+ * catalog tables.
* @return number of regions being served by all region servers
*/
public long countServedRegions() {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/StartMiniClusterOption.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/StartTestingClusterOption.java
similarity index 82%
copy from hbase-server/src/test/java/org/apache/hadoop/hbase/StartMiniClusterOption.java
copy to hbase-server/src/test/java/org/apache/hadoop/hbase/StartTestingClusterOption.java
index 7a9bd68..60e61f6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/StartMiniClusterOption.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/StartTestingClusterOption.java
@@ -20,30 +20,33 @@ package org.apache.hadoop.hbase;
import java.util.Arrays;
import java.util.List;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.yetus.audience.InterfaceAudience;
+import org.apache.yetus.audience.InterfaceStability;
/**
- * Options for starting up a mini cluster (including an hbase, dfs and zookeeper clusters) in test.
- * The options include HDFS options to build mini dfs cluster, Zookeeper options to build mini zk
- * cluster, and mostly HBase options to build mini hbase cluster.
- *
+ * Options for starting up a testing cluster (including an hbase, dfs and zookeeper clusters) in
+ * test. The options include HDFS options to build mini dfs cluster, Zookeeper options to build mini
+ * zk cluster, and mostly HBase options to build mini hbase cluster.
+ * <p/>
* To create an object, use a {@link Builder}.
+ * <p/>
* Example usage:
+ *
* <pre>
- * StartMiniClusterOption option = StartMiniClusterOption.builder().
+ * StartTestingClusterOption option = StartTestingClusterOption.builder().
* .numMasters(3).rsClass(MyRegionServer.class).createWALDir(true).build();
* </pre>
*
* Default values can be found in {@link Builder}.
*/
-@InterfaceAudience.Public
-public final class StartMiniClusterOption {
+@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.PHOENIX)
+@InterfaceStability.Evolving
+public final class StartTestingClusterOption {
/**
* Number of masters to start up. We'll start this many hbase masters. If numMasters > 1, you
- * can find the active/primary master with {@link MiniHBaseCluster#getMaster()}.
+ * can find the active/primary master with {@link SingleProcessHBaseCluster#getMaster()}.
*/
private final int numMasters;
@@ -74,7 +77,7 @@ public final class StartMiniClusterOption {
/**
* The class to use as HRegionServer, or null for default.
*/
- private Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass;
+ private Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass;
/**
* Number of datanodes. Used to create mini DSF cluster. Surpassed by {@link #dataNodeHosts} size.
@@ -107,10 +110,11 @@ public final class StartMiniClusterOption {
/**
* Private constructor. Use {@link Builder#build()}.
*/
- private StartMiniClusterOption(int numMasters, int numAlwaysStandByMasters,
- Class<? extends HMaster> masterClass, int numRegionServers, List<Integer> rsPorts,
- Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass, int numDataNodes,
- String[] dataNodeHosts, int numZkServers, boolean createRootDir, boolean createWALDir) {
+ private StartTestingClusterOption(int numMasters, int numAlwaysStandByMasters,
+ Class<? extends HMaster> masterClass, int numRegionServers, List<Integer> rsPorts,
+ Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass,
+ int numDataNodes, String[] dataNodeHosts, int numZkServers, boolean createRootDir,
+ boolean createWALDir) {
this.numMasters = numMasters;
this.numAlwaysStandByMasters = numAlwaysStandByMasters;
this.masterClass = masterClass;
@@ -144,7 +148,7 @@ public final class StartMiniClusterOption {
return rsPorts;
}
- public Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> getRsClass() {
+ public Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> getRsClass() {
return rsClass;
}
@@ -185,7 +189,7 @@ public final class StartMiniClusterOption {
}
/**
- * Builder pattern for creating an {@link StartMiniClusterOption}.
+ * Builder pattern for creating an {@link StartTestingClusterOption}.
*
* The default values of its fields should be considered public and constant. Changing the default
* values may cause other tests fail.
@@ -196,7 +200,7 @@ public final class StartMiniClusterOption {
private Class<? extends HMaster> masterClass = null;
private int numRegionServers = 1;
private List<Integer> rsPorts = null;
- private Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass = null;
+ private Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass = null;
private int numDataNodes = 1;
private String[] dataNodeHosts = null;
private int numZkServers = 1;
@@ -206,11 +210,11 @@ public final class StartMiniClusterOption {
private Builder() {
}
- public StartMiniClusterOption build() {
+ public StartTestingClusterOption build() {
if (dataNodeHosts != null && dataNodeHosts.length != 0) {
numDataNodes = dataNodeHosts.length;
}
- return new StartMiniClusterOption(numMasters,numAlwaysStandByMasters, masterClass,
+ return new StartTestingClusterOption(numMasters,numAlwaysStandByMasters, masterClass,
numRegionServers, rsPorts, rsClass, numDataNodes, dataNodeHosts, numZkServers,
createRootDir, createWALDir);
}
@@ -240,7 +244,8 @@ public final class StartMiniClusterOption {
return this;
}
- public Builder rsClass(Class<? extends MiniHBaseCluster.MiniHBaseClusterRegionServer> rsClass) {
+ public Builder
+ rsClass(Class<? extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer> rsClass) {
this.rsClass = rsClass;
return this;
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java
index c146685..8dd82fe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestCachedClusterId.java
@@ -36,7 +36,7 @@ public class TestCachedClusterId {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestCachedClusterId.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static String clusterId;
private static HMaster activeMaster;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java
index b578ffe..6aef56b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterMetrics.java
@@ -71,11 +71,11 @@ public class TestClientClusterMetrics {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestClientClusterMetrics.class);
- private static HBaseTestingUtility UTIL;
+ private static HBaseTestingUtil UTIL;
private static Admin ADMIN;
private final static int SLAVES = 5;
private final static int MASTERS = 3;
- private static MiniHBaseCluster CLUSTER;
+ private static SingleProcessHBaseCluster CLUSTER;
private static HRegionServer DEAD;
private static final TableName TABLE_NAME = TableName.valueOf("test");
private static final byte[] CF = Bytes.toBytes("cf");
@@ -85,8 +85,8 @@ public class TestClientClusterMetrics {
public static void setUpBeforeClass() throws Exception {
Configuration conf = HBaseConfiguration.create();
conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyObserver.class.getName());
- UTIL = new HBaseTestingUtility(conf);
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ UTIL = new HBaseTestingUtil(conf);
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(MASTERS).numRegionServers(SLAVES).numDataNodes(SLAVES).build();
UTIL.startMiniCluster(option);
CLUSTER = UTIL.getHBaseCluster();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
index f7de667..8dee17d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientClusterStatus.java
@@ -53,19 +53,19 @@ public class TestClientClusterStatus {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestClientClusterStatus.class);
- private static HBaseTestingUtility UTIL;
+ private static HBaseTestingUtil UTIL;
private static Admin ADMIN;
private final static int SLAVES = 5;
private final static int MASTERS = 3;
- private static MiniHBaseCluster CLUSTER;
+ private static SingleProcessHBaseCluster CLUSTER;
private static HRegionServer DEAD;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
Configuration conf = HBaseConfiguration.create();
conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, MyObserver.class.getName());
- UTIL = new HBaseTestingUtility(conf);
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ UTIL = new HBaseTestingUtil(conf);
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(MASTERS).numRegionServers(SLAVES).numDataNodes(SLAVES).build();
UTIL.startMiniCluster(option);
CLUSTER = UTIL.getHBaseCluster();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
index eb62c97..a70f124 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClientOperationTimeout.java
@@ -80,7 +80,7 @@ public class TestClientOperationTimeout {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestClientOperationTimeout.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
// Activate the delays after table creation to test get/scan/put
private static int DELAY_GET;
@@ -100,8 +100,8 @@ public class TestClientOperationTimeout {
@BeforeClass
public static void setUp() throws Exception {
// Set RegionServer class and use default values for other options.
- StartMiniClusterOption option =
- StartMiniClusterOption.builder().rsClass(DelayedRegionServer.class).build();
+ StartTestingClusterOption option =
+ StartTestingClusterOption.builder().rsClass(DelayedRegionServer.class).build();
UTIL.startMiniCluster(option);
UTIL.getAdmin().createTable(TableDescriptorBuilder.newBuilder(TABLE_NAME)
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)).build());
@@ -211,7 +211,7 @@ public class TestClientOperationTimeout {
}
public static final class DelayedRegionServer
- extends MiniHBaseCluster.MiniHBaseClusterRegionServer {
+ extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {
public DelayedRegionServer(Configuration conf) throws IOException, InterruptedException {
super(conf);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
index 2d16a90..1f6381a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterBootOrder.java
@@ -42,14 +42,14 @@ public class TestClusterBootOrder {
private static final long SLEEP_INTERVAL = 1000;
private static final long SLEEP_TIME = 4000;
- private HBaseTestingUtility testUtil;
+ private HBaseTestingUtil testUtil;
private LocalHBaseCluster cluster;
private RegionServerThread rs;
private MasterThread master;
@Before
public void setUp() throws Exception {
- testUtil = new HBaseTestingUtility();
+ testUtil = new HBaseTestingUtil();
testUtil.startMiniDFSCluster(1);
testUtil.startMiniZKCluster(1);
testUtil.createRootDir(); //manually setup hbase dir to point to minidfscluster
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java
index 4d37ca5..38d1627 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestClusterPortAssignment.java
@@ -35,7 +35,7 @@ public class TestClusterPortAssignment {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestClusterPortAssignment.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final Logger LOG = LoggerFactory.getLogger(TestClusterPortAssignment.class);
/**
@@ -46,10 +46,10 @@ public class TestClusterPortAssignment {
public void testClusterPortAssignment() throws Exception {
boolean retry = false;
do {
- int masterPort = HBaseTestingUtility.randomFreePort();
- int masterInfoPort = HBaseTestingUtility.randomFreePort();
- int rsPort = HBaseTestingUtility.randomFreePort();
- int rsInfoPort = HBaseTestingUtility.randomFreePort();
+ int masterPort = HBaseTestingUtil.randomFreePort();
+ int masterInfoPort = HBaseTestingUtil.randomFreePort();
+ int rsPort = HBaseTestingUtil.randomFreePort();
+ int rsInfoPort = HBaseTestingUtil.randomFreePort();
TEST_UTIL.getConfiguration().setBoolean(LocalHBaseCluster.ASSIGN_RANDOM_PORTS, false);
TEST_UTIL.getConfiguration().setBoolean(HConstants.REGIONSERVER_INFO_PORT_AUTO, false);
TEST_UTIL.getConfiguration().setBoolean("fs.hdfs.impl.disable.cache", true);
@@ -59,7 +59,7 @@ public class TestClusterPortAssignment {
TEST_UTIL.getConfiguration().setInt(HConstants.REGIONSERVER_INFO_PORT, rsInfoPort);
LOG.info("Ports: {}, {}, {}, {}", masterPort, masterInfoPort, rsPort, rsInfoPort);
try {
- MiniHBaseCluster cluster = TEST_UTIL.startMiniCluster();
+ SingleProcessHBaseCluster cluster = TEST_UTIL.startMiniCluster();
assertTrue("Cluster failed to come up", cluster.waitForActiveAndReadyMaster(30000));
retry = false;
assertEquals("Master RPC port is incorrect", masterPort,
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java
index eab1916..67bdcd1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestColumnFamilyDescriptorDefaultVersions.java
@@ -54,7 +54,7 @@ public class TestColumnFamilyDescriptorDefaultVersions {
@Rule
public TestName name = new TestName();
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = null;
private static final byte[] FAMILY = Bytes.toBytes("cf0");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
index d627244..a69d68b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFSTableDescriptorForceCreation.java
@@ -41,7 +41,7 @@ public class TestFSTableDescriptorForceCreation {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFSTableDescriptorForceCreation.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
index c6119b2..250d9a1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
@@ -42,7 +42,7 @@ public class TestFullLogReconstruction {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFullLogReconstruction.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private final static TableName TABLE_NAME = TableName.valueOf("tabletest");
private final static byte[] FAMILY = Bytes.toBytes("family");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
index 882bc9d..0ff2bd1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java
@@ -62,8 +62,8 @@ public class TestGlobalMemStoreSize {
// total region num = region num + meta regions
private static int totalRegionNum = regionNum + 1;
- private HBaseTestingUtility TEST_UTIL;
- private MiniHBaseCluster cluster;
+ private HBaseTestingUtil TEST_UTIL;
+ private SingleProcessHBaseCluster cluster;
@Rule
public TestName name = new TestName();
@@ -78,7 +78,7 @@ public class TestGlobalMemStoreSize {
// Start the cluster
LOG.info("Starting cluster");
Configuration conf = HBaseConfiguration.create();
- TEST_UTIL = new HBaseTestingUtility(conf);
+ TEST_UTIL = new HBaseTestingUtil(conf);
TEST_UTIL.startMiniCluster(regionServerNum);
cluster = TEST_UTIL.getHBaseCluster();
LOG.info("Waiting for active/ready master");
@@ -178,7 +178,7 @@ public class TestGlobalMemStoreSize {
*/
private void waitForAllRegionsAssigned() throws IOException {
while (true) {
- int regionCount = HBaseTestingUtility.getAllOnlineRegions(cluster).size();
+ int regionCount = HBaseTestingUtil.getAllOnlineRegions(cluster).size();
if (regionCount >= totalRegionNum) break;
LOG.debug("Waiting for there to be "+ totalRegionNum
+" regions, but there are " + regionCount + " right now.");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java
index 33c0f10..fb3ea93 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseMetaEdit.java
@@ -53,7 +53,7 @@ public class TestHBaseMetaEdit {
HBaseClassTestRule.forClass(TestHBaseMetaEdit.class);
@Rule
public TestName name = new TestName();
- private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();
@Before
public void before() throws Exception {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
index 531ba07..d2bcebb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseOnOtherDfsCluster.java
@@ -49,11 +49,11 @@ public class TestHBaseOnOtherDfsCluster {
@Test
public void testOveralyOnOtherCluster() throws Exception {
// just run HDFS
- HBaseTestingUtility util1 = new HBaseTestingUtility();
+ HBaseTestingUtil util1 = new HBaseTestingUtil();
MiniDFSCluster dfs = util1.startMiniDFSCluster(1);
// run HBase on that HDFS
- HBaseTestingUtility util2 = new HBaseTestingUtility();
+ HBaseTestingUtil util2 = new HBaseTestingUtil();
// set the dfs
util2.setDFSCluster(dfs, false);
util2.startMiniCluster();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtil.java
similarity index 91%
rename from hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
rename to hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtil.java
index 993af21..7076bf9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestHBaseTestingUtil.java
@@ -24,6 +24,7 @@ import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+
import java.io.File;
import java.util.List;
import java.util.Random;
@@ -57,16 +58,16 @@ import org.slf4j.LoggerFactory;
* Test our testing utility class
*/
@Category({MiscTests.class, LargeTests.class})
-public class TestHBaseTestingUtility {
+public class TestHBaseTestingUtil {
private static final int NUMTABLES = 1;
private static final int NUMROWS = 100;
private static final int NUMREGIONS = 10;
@ClassRule
public static final HBaseClassTestRule CLASS_RULE =
- HBaseClassTestRule.forClass(TestHBaseTestingUtility.class);
+ HBaseClassTestRule.forClass(TestHBaseTestingUtil.class);
- private static final Logger LOG = LoggerFactory.getLogger(TestHBaseTestingUtility.class);
+ private static final Logger LOG = LoggerFactory.getLogger(TestHBaseTestingUtil.class);
@Rule
public TestName name = new TestName();
@@ -82,13 +83,13 @@ public class TestHBaseTestingUtility {
// Create three clusters
// Cluster 1.
- HBaseTestingUtility htu1 = new HBaseTestingUtility();
+ HBaseTestingUtil htu1 = new HBaseTestingUtil();
// Set a different zk path for each cluster
htu1.getConfiguration().set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/1");
htu1.startMiniZKCluster();
// Cluster 2
- HBaseTestingUtility htu2 = new HBaseTestingUtility();
+ HBaseTestingUtil htu2 = new HBaseTestingUtil();
htu2.getConfiguration().set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");
htu2.getConfiguration().set(HConstants.ZOOKEEPER_CLIENT_PORT,
htu1.getConfiguration().get(HConstants.ZOOKEEPER_CLIENT_PORT, "-1"));
@@ -97,7 +98,7 @@ public class TestHBaseTestingUtility {
// Cluster 3; seed it with the conf from htu1 so we pickup the 'right'
// zk cluster config; it is set back into the config. as part of the
// start of minizkcluster.
- HBaseTestingUtility htu3 = new HBaseTestingUtility();
+ HBaseTestingUtil htu3 = new HBaseTestingUtil();
htu3.getConfiguration().set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/3");
htu3.getConfiguration().set(HConstants.ZOOKEEPER_CLIENT_PORT,
htu1.getConfiguration().get(HConstants.ZOOKEEPER_CLIENT_PORT, "-1"));
@@ -140,9 +141,9 @@ public class TestHBaseTestingUtility {
}
@Test public void testMiniCluster() throws Exception {
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
- MiniHBaseCluster cluster = hbt.startMiniCluster();
+ SingleProcessHBaseCluster cluster = hbt.startMiniCluster();
try {
assertEquals(1, cluster.getLiveRegionServerThreads().size());
} finally {
@@ -152,9 +153,9 @@ public class TestHBaseTestingUtility {
@Test
public void testMiniClusterBindToWildcard() throws Exception {
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
hbt.getConfiguration().set("hbase.regionserver.ipc.address", "0.0.0.0");
- MiniHBaseCluster cluster = hbt.startMiniCluster();
+ SingleProcessHBaseCluster cluster = hbt.startMiniCluster();
try {
assertEquals(1, cluster.getLiveRegionServerThreads().size());
} finally {
@@ -165,11 +166,11 @@ public class TestHBaseTestingUtility {
@Test
public void testMiniClusterWithSSLOn() throws Exception {
final String BASEDIR = System.getProperty("test.build.dir",
- "target/test-dir") + "/" + TestHBaseTestingUtility.class.getSimpleName();
- String sslConfDir = KeyStoreTestUtil.getClasspathDir(TestHBaseTestingUtility.class);
+ "target/test-dir") + "/" + TestHBaseTestingUtil.class.getSimpleName();
+ String sslConfDir = KeyStoreTestUtil.getClasspathDir(TestHBaseTestingUtil.class);
String keystoresDir = new File(BASEDIR).getAbsolutePath();
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
File base = new File(BASEDIR);
FileUtil.fullyDelete(base);
base.mkdirs();
@@ -180,7 +181,7 @@ public class TestHBaseTestingUtility {
hbt.getConfiguration().addResource(hbt.getConfiguration().get(SSLFactory.SSL_CLIENT_CONF_KEY));
hbt.getConfiguration().addResource(hbt.getConfiguration().get(SSLFactory.SSL_SERVER_CONF_KEY));
- MiniHBaseCluster cluster = hbt.startMiniCluster();
+ SingleProcessHBaseCluster cluster = hbt.startMiniCluster();
try {
assertEquals(1, cluster.getLiveRegionServerThreads().size());
} finally {
@@ -193,7 +194,7 @@ public class TestHBaseTestingUtility {
* with the same HBaseTestingUtility.
*/
@Test public void testMultipleStartStop() throws Exception{
- HBaseTestingUtility htu1 = new HBaseTestingUtility();
+ HBaseTestingUtil htu1 = new HBaseTestingUtil();
Path foo = new Path("foo");
htu1.startMiniCluster();
@@ -210,7 +211,7 @@ public class TestHBaseTestingUtility {
@Test
public void testMiniZooKeeperWithOneServer() throws Exception {
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
MiniZooKeeperCluster cluster1 = hbt.startMiniZKCluster();
try {
assertEquals(0, cluster1.getBackupZooKeeperServerNum());
@@ -222,7 +223,7 @@ public class TestHBaseTestingUtility {
@Test
public void testMiniZooKeeperWithMultipleServers() throws Exception {
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
// set up zookeeper cluster with 5 zk servers
MiniZooKeeperCluster cluster2 = hbt.startMiniZKCluster(5);
int defaultClientPort = 21818;
@@ -266,7 +267,7 @@ public class TestHBaseTestingUtility {
public void testMiniZooKeeperWithMultipleClientPorts() throws Exception {
int defaultClientPort = 8888;
int i, j;
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
// Test 1 - set up zookeeper cluster with same number of ZK servers and specified client ports
int [] clientPortList1 = {1111, 1112, 1113};
@@ -370,7 +371,7 @@ public class TestHBaseTestingUtility {
}
@Test public void testMiniDFSCluster() throws Exception {
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
MiniDFSCluster cluster = hbt.startMiniDFSCluster(null);
FileSystem dfs = cluster.getFileSystem();
Path dir = new Path("dir");
@@ -383,7 +384,7 @@ public class TestHBaseTestingUtility {
}
@Test public void testSetupClusterTestBuildDir() throws Exception {
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
Path testdir = hbt.getClusterTestDir();
LOG.info("uuid-subdir=" + testdir);
FileSystem fs = hbt.getTestFileSystem();
@@ -398,7 +399,7 @@ public class TestHBaseTestingUtility {
}
@Test public void testTestDir() throws Exception {
- HBaseTestingUtility hbt = new HBaseTestingUtility();
+ HBaseTestingUtil hbt = new HBaseTestingUtil();
Path testdir = hbt.getDataTestDir();
LOG.info("testdir=" + testdir);
FileSystem fs = hbt.getTestFileSystem();
@@ -423,12 +424,12 @@ public class TestHBaseTestingUtility {
}
});
- HBaseTestingUtility.PortAllocator.AvailablePortChecker portChecker =
- mock(HBaseTestingUtility.PortAllocator.AvailablePortChecker.class);
+ HBaseTestingUtil.PortAllocator.AvailablePortChecker portChecker =
+ mock(HBaseTestingUtil.PortAllocator.AvailablePortChecker.class);
when(portChecker.available(anyInt())).thenReturn(true);
- HBaseTestingUtility.PortAllocator portAllocator =
- new HBaseTestingUtility.PortAllocator(random, portChecker);
+ HBaseTestingUtil.PortAllocator portAllocator =
+ new HBaseTestingUtil.PortAllocator(random, portChecker);
int port1 = portAllocator.randomFreePort();
int port2 = portAllocator.randomFreePort();
@@ -444,9 +445,9 @@ public class TestHBaseTestingUtility {
defaultConfig.setInt(HConstants.MASTER_INFO_PORT, HConstants.DEFAULT_MASTER_INFOPORT);
defaultConfig.setInt(HConstants.REGIONSERVER_INFO_PORT,
HConstants.DEFAULT_REGIONSERVER_INFOPORT);
- HBaseTestingUtility htu = new HBaseTestingUtility(defaultConfig);
+ HBaseTestingUtil htu = new HBaseTestingUtil(defaultConfig);
try {
- MiniHBaseCluster defaultCluster = htu.startMiniCluster();
+ SingleProcessHBaseCluster defaultCluster = htu.startMiniCluster();
final String masterHostPort =
defaultCluster.getMaster().getServerName().getAddress().toString();
assertNotEquals(HConstants.DEFAULT_MASTER_INFOPORT,
@@ -465,9 +466,9 @@ public class TestHBaseTestingUtility {
final int nonDefaultRegionServerPort = 4444;
altConfig.setInt(HConstants.MASTER_INFO_PORT, nonDefaultMasterInfoPort);
altConfig.setInt(HConstants.REGIONSERVER_INFO_PORT, nonDefaultRegionServerPort);
- htu = new HBaseTestingUtility(altConfig);
+ htu = new HBaseTestingUtil(altConfig);
try {
- MiniHBaseCluster customCluster = htu.startMiniCluster();
+ SingleProcessHBaseCluster customCluster = htu.startMiniCluster();
final String masterHostPort =
customCluster.getMaster().getServerName().getAddress().toString();
assertEquals(nonDefaultMasterInfoPort,
@@ -486,7 +487,7 @@ public class TestHBaseTestingUtility {
@Test
public void testKillMiniHBaseCluster() throws Exception {
- HBaseTestingUtility htu = new HBaseTestingUtility();
+ HBaseTestingUtil htu = new HBaseTestingUtil();
htu.startMiniZKCluster();
try {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
index fa2a337..3c2bc3f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIOFencing.java
@@ -221,7 +221,7 @@ public class TestIOFencing {
}
}
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private final static TableName TABLE_NAME =
TableName.valueOf("tabletest");
private final static byte[] FAMILY = Bytes.toBytes("family");
@@ -365,7 +365,7 @@ public class TestIOFencing {
int count;
for (int i = 0;; i++) {
try {
- count = HBaseTestingUtility.countRows(table);
+ count = HBaseTestingUtil.countRows(table);
break;
} catch (DoNotRetryIOException e) {
// wait up to 30s
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java
index 44c10ef..4eb6aa4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestIPv6NIOServerSocketChannel.java
@@ -58,7 +58,7 @@ public class TestIPv6NIOServerSocketChannel {
*/
private void bindServerSocket(InetAddress inetAddr) throws IOException {
while(true) {
- int port = HBaseTestingUtility.randomFreePort();
+ int port = HBaseTestingUtil.randomFreePort();
InetSocketAddress addr = new InetSocketAddress(inetAddr, port);
ServerSocket serverSocket = null;
try {
@@ -84,7 +84,7 @@ public class TestIPv6NIOServerSocketChannel {
*/
private void bindNIOServerSocket(InetAddress inetAddr) throws IOException {
while (true) {
- int port = HBaseTestingUtility.randomFreePort();
+ int port = HBaseTestingUtil.randomFreePort();
InetSocketAddress addr = new InetSocketAddress(inetAddr, port);
ServerSocketChannel channel = null;
ServerSocket serverSocket = null;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
index 179220c..329add7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestInfoServers.java
@@ -51,7 +51,7 @@ public class TestInfoServers {
HBaseClassTestRule.forClass(TestInfoServers.class);
private static final Logger LOG = LoggerFactory.getLogger(TestInfoServers.class);
- private final static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
index 3035401..159d76f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXConnectorServer.java
@@ -53,7 +53,7 @@ public class TestJMXConnectorServer {
HBaseClassTestRule.forClass(TestJMXConnectorServer.class);
private static final Logger LOG = LoggerFactory.getLogger(TestJMXConnectorServer.class);
- private static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static Configuration conf = null;
private static Admin admin;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java
index f43d390..fc8a162 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestJMXListener.java
@@ -46,7 +46,7 @@ public class TestJMXListener {
HBaseClassTestRule.forClass(TestJMXListener.class);
private static final Logger LOG = LoggerFactory.getLogger(TestJMXListener.class);
- private static HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static int CONNECTOR_PORT;
@BeforeClass
@@ -60,7 +60,7 @@ public class TestJMXListener {
// To test what happens when the jmx listener can't put up its port, uncomment the below.
BoundSocketMaker bsm = null; // new BoundSocketMaker(HBaseTestingUtility::randomFreePort);
conf.set(CoprocessorHost.REGIONSERVER_COPROCESSOR_CONF_KEY, JMXListener.class.getName());
- CONNECTOR_PORT = bsm == null? HBaseTestingUtility.randomFreePort(): bsm.getPort();
+ CONNECTOR_PORT = bsm == null? HBaseTestingUtil.randomFreePort(): bsm.getPort();
// Make sure the JMX listener is up before we proceed. If it is not up, retry. It may not
// come up if there is a port clash/bind exception except its called something else in rmi.
for (int i = 0; i < 10; i++) {
@@ -75,7 +75,7 @@ public class TestJMXListener {
break;
} catch (IOException ioe) {
UTIL.shutdownMiniCluster();
- CONNECTOR_PORT = HBaseTestingUtility.randomFreePort();
+ CONNECTOR_PORT = HBaseTestingUtil.randomFreePort();
} finally {
if (connector != null) {
connector.close();
@@ -110,7 +110,7 @@ public class TestJMXListener {
public ExpectedException expectedEx = ExpectedException.none();
@Test
public void testStop() throws Exception {
- MiniHBaseCluster cluster = UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster cluster = UTIL.getHBaseCluster();
LOG.info("shutdown hbase cluster...");
cluster.shutdown();
LOG.info("wait for the hbase cluster shutdown...");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java
index 7e9e7cb..702bf45 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestLocalHBaseCluster.java
@@ -36,7 +36,7 @@ public class TestLocalHBaseCluster {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestLocalHBaseCluster.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
/**
* Check that we can start a local HBase cluster specifying a custom master
@@ -48,7 +48,7 @@ public class TestLocalHBaseCluster {
@Test
public void testLocalHBaseCluster() throws Exception {
// Set Master class and RegionServer class, and use default values for other options.
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.masterClass(MyHMaster.class).rsClass(MyHRegionServer.class).build();
TEST_UTIL.startMiniCluster(option);
// Can we cast back to our master class?
@@ -86,7 +86,8 @@ public class TestLocalHBaseCluster {
/**
* A private regionserver class with a dummy method for testing casts
*/
- public static class MyHRegionServer extends MiniHBaseCluster.MiniHBaseClusterRegionServer {
+ public static class MyHRegionServer
+ extends SingleProcessHBaseCluster.MiniHBaseClusterRegionServer {
public MyHRegionServer(Configuration conf) throws IOException, InterruptedException {
super(conf);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
index f317fdf..922da6f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableAccessor.java
@@ -78,7 +78,7 @@ public class TestMetaTableAccessor {
HBaseClassTestRule.forClass(TestMetaTableAccessor.class);
private static final Logger LOG = LoggerFactory.getLogger(TestMetaTableAccessor.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static Connection connection;
private Random random = new Random();
@@ -408,7 +408,7 @@ public class TestMetaTableAccessor {
UTIL.createTable(tableName, FAMILY, SPLIT_KEYS);
Table table = connection.getTable(tableName);
// Make sure all the regions are deployed
- HBaseTestingUtility.countRows(table);
+ HBaseTestingUtil.countRows(table);
ClientMetaTableAccessor.Visitor visitor = mock(ClientMetaTableAccessor.Visitor.class);
doReturn(true).when(visitor).visit((Result) anyObject());
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java
index db72ae7..3bea0a7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaTableLocator.java
@@ -59,7 +59,7 @@ public class TestMetaTableLocator {
HBaseClassTestRule.forClass(TestMetaTableLocator.class);
private static final Logger LOG = LoggerFactory.getLogger(TestMetaTableLocator.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final ServerName SN =
ServerName.valueOf("example.org", 1234, EnvironmentEdgeManager.currentTime());
private ZKWatcher watcher;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaUpdatesGoToPriorityQueue.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaUpdatesGoToPriorityQueue.java
index e2a8adb..cd04157 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaUpdatesGoToPriorityQueue.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMetaUpdatesGoToPriorityQueue.java
@@ -57,7 +57,7 @@ public class TestMetaUpdatesGoToPriorityQueue {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestMetaUpdatesGoToPriorityQueue.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
@BeforeClass
public static void beforeClass() throws Exception {
@@ -111,7 +111,7 @@ public class TestMetaUpdatesGoToPriorityQueue {
.setEndKey(parent.getEndKey()).setSplit(false).setRegionId(rid).build();
// find the meta server
- MiniHBaseCluster cluster = UTIL.getMiniHBaseCluster();
+ SingleProcessHBaseCluster cluster = UTIL.getMiniHBaseCluster();
int rsIndex = cluster.getServerWithMeta();
HRegionServer rs;
if (rsIndex >= 0) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java
index ea0b9f8..6662ffb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMovedRegionCache.java
@@ -50,7 +50,7 @@ public class TestMovedRegionCache {
@Rule
public TestName name = new TestName();
- private HBaseTestingUtility UTIL;
+ private HBaseTestingUtil UTIL;
private MiniZooKeeperCluster zkCluster;
private HRegionServer source;
private HRegionServer dest;
@@ -58,10 +58,11 @@ public class TestMovedRegionCache {
@Before
public void setup() throws Exception {
- UTIL = new HBaseTestingUtility();
+ UTIL = new HBaseTestingUtil();
zkCluster = UTIL.startMiniZKCluster();
- StartMiniClusterOption option = StartMiniClusterOption.builder().numRegionServers(2).build();
- MiniHBaseCluster cluster = UTIL.startMiniHBaseCluster(option);
+ StartTestingClusterOption option =
+ StartTestingClusterOption.builder().numRegionServers(2).build();
+ SingleProcessHBaseCluster cluster = UTIL.startMiniHBaseCluster(option);
source = cluster.getRegionServer(0);
dest = cluster.getRegionServer(1);
assertEquals(2, cluster.getRegionServerThreads().size());
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
index edf553b..45728b4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* Port of old TestScanMultipleVersions, TestTimestamp and TestGetRowVersions
- * from old testing framework to {@link HBaseTestingUtility}.
+ * from old testing framework to {@link HBaseTestingUtil}.
*/
@Category({MiscTests.class, MediumTests.class})
public class TestMultiVersions {
@@ -64,7 +64,7 @@ public class TestMultiVersions {
HBaseClassTestRule.forClass(TestMultiVersions.class);
private static final Logger LOG = LoggerFactory.getLogger(TestMultiVersions.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private Admin admin;
private static final int NUM_SLAVES = 3;
@@ -155,7 +155,7 @@ public class TestMultiVersions {
table.close();
UTIL.shutdownMiniHBaseCluster();
LOG.debug("HBase cluster shut down -- restarting");
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numRegionServers(NUM_SLAVES).build();
UTIL.startMiniHBaseCluster(option);
// Make a new connection.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java
index 9eb7d81..b63054f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNamespace.java
@@ -65,9 +65,9 @@ public class TestNamespace {
private static final Logger LOG = LoggerFactory.getLogger(TestNamespace.class);
private static HMaster master;
protected final static int NUM_SLAVES_BASE = 4;
- private static HBaseTestingUtility TEST_UTIL;
+ private static HBaseTestingUtil TEST_UTIL;
protected static Admin admin;
- protected static HBaseCluster cluster;
+ protected static HBaseClusterInterface cluster;
private String prefix = "TestNamespace";
@Rule
@@ -75,11 +75,11 @@ public class TestNamespace {
@BeforeClass
public static void setUp() throws Exception {
- TEST_UTIL = new HBaseTestingUtility();
+ TEST_UTIL = new HBaseTestingUtil();
TEST_UTIL.startMiniCluster(NUM_SLAVES_BASE);
admin = TEST_UTIL.getAdmin();
cluster = TEST_UTIL.getHBaseCluster();
- master = ((MiniHBaseCluster)cluster).getMaster();
+ master = ((SingleProcessHBaseCluster)cluster).getMaster();
LOG.info("Done initializing cluster");
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
index 1603d3a..60a0880 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestNodeHealthCheckChore.java
@@ -47,7 +47,7 @@ public class TestNodeHealthCheckChore {
HBaseClassTestRule.forClass(TestNodeHealthCheckChore.class);
private static final Logger LOG = LoggerFactory.getLogger(TestNodeHealthCheckChore.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final int SCRIPT_TIMEOUT = 5000;
private File healthScriptFile;
private String eol = System.getProperty("line.separator");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
index cb1a192..1b2b262 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestPartialResultsFromClientSide.java
@@ -75,7 +75,7 @@ public class TestPartialResultsFromClientSide {
private static final Logger LOG = LoggerFactory.getLogger(TestPartialResultsFromClientSide.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private final static int MINICLUSTER_SIZE = 5;
private static Table TABLE = null;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
index 49d8668..bb683e4 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionMetrics.java
@@ -54,7 +54,7 @@ public class TestRegionMetrics {
HBaseClassTestRule.forClass(TestRegionMetrics.class);
private static final Logger LOG = LoggerFactory.getLogger(TestRegionMetrics.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static Admin admin;
private static final TableName TABLE_1 = TableName.valueOf("table_1");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
index 483edde..c9ac60d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
@@ -76,7 +76,7 @@ public class TestRegionRebalancing {
private static final byte[] FAMILY_NAME = Bytes.toBytes("col");
private static final Logger LOG = LoggerFactory.getLogger(TestRegionRebalancing.class);
- private final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private RegionLocator regionLocator;
private TableDescriptor tableDescriptor;
private String balancerName;
@@ -112,14 +112,14 @@ public class TestRegionRebalancing {
throws IOException, InterruptedException {
try(Connection connection = ConnectionFactory.createConnection(UTIL.getConfiguration());
Admin admin = connection.getAdmin()) {
- admin.createTable(this.tableDescriptor, Arrays.copyOfRange(HBaseTestingUtility.KEYS,
- 1, HBaseTestingUtility.KEYS.length));
+ admin.createTable(this.tableDescriptor, Arrays.copyOfRange(HBaseTestingUtil.KEYS,
+ 1, HBaseTestingUtil.KEYS.length));
this.regionLocator = connection.getRegionLocator(this.tableDescriptor.getTableName());
MetaTableAccessor.fullScanMetaAndPrint(admin.getConnection());
assertEquals("Test table should have right number of regions",
- HBaseTestingUtility.KEYS.length,
+ HBaseTestingUtil.KEYS.length,
this.regionLocator.getStartKeys().length);
// verify that the region assignments are balanced to start out
@@ -264,7 +264,7 @@ public class TestRegionRebalancing {
* Wait until all the regions are assigned.
*/
private void waitForAllRegionsAssigned() throws IOException {
- int totalRegions = HBaseTestingUtility.KEYS.length;
+ int totalRegions = HBaseTestingUtil.KEYS.length;
try {
Thread.sleep(200);
} catch (InterruptedException e) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java
index e657d9c..0734848 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSequenceIdMonotonicallyIncreasing.java
@@ -55,7 +55,7 @@ public class TestSequenceIdMonotonicallyIncreasing {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestSequenceIdMonotonicallyIncreasing.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName NAME = TableName.valueOf("test");
@@ -137,7 +137,7 @@ public class TestSequenceIdMonotonicallyIncreasing {
table.put(new Put(Bytes.toBytes(2)).addColumn(CF, CQ, Bytes.toBytes(0)));
}
UTIL.flush(NAME);
- MiniHBaseCluster cluster = UTIL.getMiniHBaseCluster();
+ SingleProcessHBaseCluster cluster = UTIL.getMiniHBaseCluster();
List<HRegion> regions = cluster.getRegions(NAME);
HRegion regionA = regions.get(0);
HRegion regionB = regions.get(1);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
index 19dde6d..3eaa2ff 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerSideScanMetricsFromClientSide.java
@@ -57,7 +57,7 @@ public class TestServerSideScanMetricsFromClientSide {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestServerSideScanMetricsFromClientSide.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static Table TABLE = null;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
index b129017..ce70035 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSplitMerge.java
@@ -46,7 +46,7 @@ public class TestSplitMerge {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestSplitMerge.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
@BeforeClass
public static void setUp() throws Exception {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
index fba8f0e..1acf0a9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java
@@ -68,7 +68,7 @@ public class TestZooKeeper {
private static final Logger LOG = LoggerFactory.getLogger(TestZooKeeper.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
@@ -94,7 +94,7 @@ public class TestZooKeeper {
@Before
public void setUp() throws Exception {
- StartMiniClusterOption option = StartMiniClusterOption.builder()
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
.numMasters(2).numRegionServers(2).build();
TEST_UTIL.startMiniHBaseCluster(option);
}
@@ -138,7 +138,7 @@ public class TestZooKeeper {
@Test
public void testMasterZKSessionRecoveryFailure() throws Exception {
LOG.info("Starting " + name.getMethodName());
- MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster m = cluster.getMaster();
m.abort("Test recovery from zk session expired",
new KeeperException.SessionExpiredException());
@@ -176,7 +176,7 @@ public class TestZooKeeper {
*/
@Test
public void testRegionAssignmentAfterMasterRecoveryDueToZKExpiry() throws Exception {
- MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
cluster.startRegionServer();
cluster.waitForActiveAndReadyMaster(10000);
HMaster m = cluster.getMaster();
@@ -242,7 +242,7 @@ public class TestZooKeeper {
*/
@Test
public void testLogSplittingAfterMasterRecoveryDueToZKExpiry() throws Exception {
- MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
cluster.startRegionServer();
TableName tableName = TableName.valueOf(name.getMethodName());
byte[] family = Bytes.toBytes("col");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
index c8e9a56..70d39eb 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestHFileArchiving.java
@@ -44,7 +44,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.Stoppable;
import org.apache.hadoop.hbase.TableName;
@@ -93,7 +93,7 @@ public class TestHFileArchiving {
HBaseClassTestRule.forClass(TestHFileArchiving.class);
private static final Logger LOG = LoggerFactory.getLogger(TestHFileArchiving.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final byte[] TEST_FAM = Bytes.toBytes("fam");
private static DirScanPool POOL;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java
index 7472f91..6355abd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.ChoreService;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.Stoppable;
import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor;
@@ -82,7 +82,7 @@ public class TestZooKeeperTableArchiveClient {
HBaseClassTestRule.forClass(TestZooKeeperTableArchiveClient.class);
private static final Logger LOG = LoggerFactory.getLogger(TestZooKeeperTableArchiveClient.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final String STRING_TABLE_NAME = "test";
private static final byte[] TEST_FAM = Bytes.toBytes("fam");
private static final byte[] TABLE_NAME = Bytes.toBytes(STRING_TABLE_NAME);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableRegionReplicasRead.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableRegionReplicasRead.java
index 0a72d83..6134a54 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableRegionReplicasRead.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableRegionReplicasRead.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
@@ -49,7 +49,7 @@ import org.apache.hbase.thirdparty.com.google.common.io.Closeables;
public abstract class AbstractTestAsyncTableRegionReplicasRead {
- protected static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableScan.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableScan.java
index 5831bfc..c34f872 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableScan.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestAsyncTableScan.java
@@ -28,8 +28,7 @@ import java.util.concurrent.ForkJoinPool;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;
import org.apache.hadoop.hbase.util.Bytes;
@@ -40,7 +39,7 @@ import org.junit.Test;
public abstract class AbstractTestAsyncTableScan {
- protected static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCITimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCITimeout.java
index 33e7fe4..5923236 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCITimeout.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestCITimeout.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
@@ -42,7 +42,7 @@ import org.junit.rules.TestName;
*/
public abstract class AbstractTestCITimeout {
- protected static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static final byte[] FAM_NAM = Bytes.toBytes("f");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestRegionLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestRegionLocator.java
index 09a0813..f14faf7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestRegionLocator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestRegionLocator.java
@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.ServerName;
@@ -36,7 +36,7 @@ import org.junit.Test;
public abstract class AbstractTestRegionLocator {
- protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
protected static TableName TABLE_NAME = TableName.valueOf("Locator");
@@ -48,7 +48,7 @@ public abstract class AbstractTestRegionLocator {
protected static void startClusterAndCreateTable() throws Exception {
UTIL.startMiniCluster(3);
- HBaseTestingUtility.setReplicas(UTIL.getAdmin(), TableName.META_TABLE_NAME, REGION_REPLICATION);
+ HBaseTestingUtil.setReplicas(UTIL.getAdmin(), TableName.META_TABLE_NAME, REGION_REPLICATION);
TableDescriptor td =
TableDescriptorBuilder.newBuilder(TABLE_NAME).setRegionReplication(REGION_REPLICATION)
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILY)).build();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestScanCursor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestScanCursor.java
index 14f2caa..e8d51a5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestScanCursor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestScanCursor.java
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HTestConst;
import org.apache.hadoop.hbase.KeyValue;
@@ -39,7 +39,7 @@ import org.junit.BeforeClass;
public abstract class AbstractTestScanCursor {
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
/**
* Table configuration
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestUpdateConfiguration.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestUpdateConfiguration.java
index ec6204d..ff84bfc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestUpdateConfiguration.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/AbstractTestUpdateConfiguration.java
@@ -22,7 +22,7 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.util.JVMClusterUtil.RegionServerThread;
/**
@@ -39,7 +39,7 @@ public abstract class AbstractTestUpdateConfiguration {
private static Path overrideConfigFileUnderTestDataDir;
private static Path backupConfigFileUnderTestDataDir;
- protected static void setUpConfigurationFiles(final HBaseTestingUtility testUtil)
+ protected static void setUpConfigurationFiles(final HBaseTestingUtil testUtil)
throws Exception {
// Before this change, the test will update hbase-site.xml under target/test-classes and
// trigger a config reload. Since target/test-classes/hbase-site.xml is being used by
@@ -74,7 +74,7 @@ public abstract class AbstractTestUpdateConfiguration {
testUtil.getConfiguration().addResource(testUtil.getDataTestDir(SERVER_CONFIG));
}
- protected static void addResourceToRegionServerConfiguration(final HBaseTestingUtility testUtil) {
+ protected static void addResourceToRegionServerConfiguration(final HBaseTestingUtil testUtil) {
// When RegionServer is created in MiniHBaseCluster, it uses HBaseConfiguration.create(conf) of
// the master Configuration. The create() just copies config params over, it does not do
// a clone for a historic reason. Properties such as resources are lost during this process.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/ClientPushbackTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/ClientPushbackTestBase.java
index a7202b8..c818d6f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/ClientPushbackTestBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/ClientPushbackTestBase.java
@@ -28,7 +28,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
public abstract class ClientPushbackTestBase {
private static final Logger LOG = LoggerFactory.getLogger(ClientPushbackTestBase.class);
- protected static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
protected static final TableName tableName = TableName.valueOf("client-pushback");
private static final byte[] family = Bytes.toBytes("f");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/CloneSnapshotFromClientTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/CloneSnapshotFromClientTestBase.java
index 611d900..fa44c5c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/CloneSnapshotFromClientTestBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/CloneSnapshotFromClientTestBase.java
@@ -18,7 +18,7 @@
package org.apache.hadoop.hbase.client;
import java.io.IOException;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
@@ -37,7 +37,7 @@ import org.junit.rules.TestName;
*/
public class CloneSnapshotFromClientTestBase {
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected final byte[] FAMILY = Bytes.toBytes("cf");
@@ -145,7 +145,7 @@ public class CloneSnapshotFromClientTestBase {
return 1;
}
- protected void verifyRowCount(final HBaseTestingUtility util, final TableName tableName,
+ protected void verifyRowCount(final HBaseTestingUtil util, final TableName tableName,
long expectedRows) throws IOException {
SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/FromClientSideBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/FromClientSideBase.java
index d15f2d9..540acc6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/FromClientSideBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/FromClientSideBase.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.apache.hadoop.hbase.HBaseTestingUtility.countRows;
+import static org.apache.hadoop.hbase.HBaseTestingUtil.countRows;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
@@ -30,11 +30,11 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CompareOperator;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.StartMiniClusterOption;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.filter.BinaryComparator;
import org.apache.hadoop.hbase.filter.Filter;
@@ -66,7 +66,7 @@ import org.apache.hbase.thirdparty.com.google.common.base.Preconditions;
@RunWith(Parameterized.class)
class FromClientSideBase {
private static final Logger LOG = LoggerFactory.getLogger(FromClientSideBase.class);
- static HBaseTestingUtility TEST_UTIL;
+ static HBaseTestingUtil TEST_UTIL;
static byte [] ROW = Bytes.toBytes("testRow");
static byte [] FAMILY = Bytes.toBytes("testFamily");
static final byte[] INVALID_FAMILY = Bytes.toBytes("invalidTestFamily");
@@ -118,7 +118,7 @@ class FromClientSideBase {
// We reached end of a parameterized run, clean up.
TEST_UTIL.shutdownMiniCluster();
}
- TEST_UTIL = new HBaseTestingUtility();
+ TEST_UTIL = new HBaseTestingUtil();
Configuration conf = TEST_UTIL.getConfiguration();
conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
Arrays.stream(cps).map(Class::getName).toArray(String[]::new));
@@ -127,7 +127,7 @@ class FromClientSideBase {
ConnectionRegistry.class);
Preconditions.checkArgument(numHedgedReqs > 0);
conf.setInt(MasterRegistry.MASTER_REGISTRY_HEDGED_REQS_FANOUT_KEY, numHedgedReqs);
- StartMiniClusterOption.Builder builder = StartMiniClusterOption.builder();
+ StartTestingClusterOption.Builder builder = StartTestingClusterOption.builder();
// Multiple masters needed only when hedged reads for master registry are enabled.
builder.numMasters(numHedgedReqs > 1 ? 3 : 1).numRegionServers(SLAVES);
TEST_UTIL.startMiniCluster(builder.build());
@@ -200,7 +200,7 @@ class FromClientSideBase {
protected void putRows(Table ht, int numRows, String value, String key)
throws IOException {
for (int i = 0; i < numRows; i++) {
- String row = key + "_" + HBaseCommonTestingUtility.getRandomUUID().toString();
+ String row = key + "_" + HBaseCommonTestingUtil.getRandomUUID().toString();
System.out.println(String.format("Saving row: %s, with value %s", row,
value));
Put put = new Put(Bytes.toBytes(row));
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/MetaWithReplicasTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/MetaWithReplicasTestBase.java
index 8cfad19..d34b419 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/MetaWithReplicasTestBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/MetaWithReplicasTestBase.java
@@ -25,9 +25,9 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.hbase.Abortable;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.ServerName;
-import org.apache.hadoop.hbase.StartMiniClusterOption;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNameTestRule;
import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
@@ -47,7 +47,7 @@ public class MetaWithReplicasTestBase {
private static final Logger LOG = LoggerFactory.getLogger(MetaWithReplicasTestBase.class);
- protected static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static final int REGIONSERVERS_COUNT = 3;
@@ -58,11 +58,11 @@ public class MetaWithReplicasTestBase {
TEST_UTIL.getConfiguration().setInt("zookeeper.session.timeout", 30000);
TEST_UTIL.getConfiguration()
.setInt(StorefileRefresherChore.REGIONSERVER_STOREFILE_REFRESH_PERIOD, 1000);
- StartMiniClusterOption option = StartMiniClusterOption.builder().numAlwaysStandByMasters(1)
- .numMasters(1).numRegionServers(REGIONSERVERS_COUNT).build();
+ StartTestingClusterOption option = StartTestingClusterOption.builder()
+ .numAlwaysStandByMasters(1).numMasters(1).numRegionServers(REGIONSERVERS_COUNT).build();
TEST_UTIL.startMiniCluster(option);
Admin admin = TEST_UTIL.getAdmin();
- HBaseTestingUtility.setReplicas(admin, TableName.META_TABLE_NAME, 3);
+ HBaseTestingUtil.setReplicas(admin, TableName.META_TABLE_NAME, 3);
AssignmentManager am = TEST_UTIL.getMiniHBaseCluster().getMaster().getAssignmentManager();
Set<ServerName> sns = new HashSet<ServerName>();
ServerName hbaseMetaServerName =
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RegionReplicaTestHelper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RegionReplicaTestHelper.java
index 989fdbb..abb0c11 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RegionReplicaTestHelper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RegionReplicaTestHelper.java
@@ -26,7 +26,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Optional;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.RegionLocations;
@@ -43,7 +43,7 @@ public final class RegionReplicaTestHelper {
}
// waits for all replicas to have region location
- static void waitUntilAllMetaReplicasAreReady(HBaseTestingUtility util,
+ static void waitUntilAllMetaReplicasAreReady(HBaseTestingUtil util,
ConnectionRegistry registry) throws IOException {
Configuration conf = util.getConfiguration();
int regionReplicaCount =
@@ -81,7 +81,7 @@ public final class RegionReplicaTestHelper {
});
}
- static Optional<ServerName> getRSCarryingReplica(HBaseTestingUtility util, TableName tableName,
+ static Optional<ServerName> getRSCarryingReplica(HBaseTestingUtil util, TableName tableName,
int replicaId) {
return util.getHBaseCluster().getRegionServerThreads().stream().map(t -> t.getRegionServer())
.filter(rs -> rs.getRegions(tableName).stream()
@@ -92,7 +92,7 @@ public final class RegionReplicaTestHelper {
/**
* Return the new location.
*/
- static ServerName moveRegion(HBaseTestingUtility util, HRegionLocation currentLoc)
+ static ServerName moveRegion(HBaseTestingUtil util, HRegionLocation currentLoc)
throws Exception {
ServerName serverName = currentLoc.getServerName();
RegionInfo regionInfo = currentLoc.getRegion();
@@ -125,7 +125,7 @@ public final class RegionReplicaTestHelper {
void updateCachedLocationOnError(HRegionLocation loc, Throwable error) throws Exception;
}
- static void testLocator(HBaseTestingUtility util, TableName tableName, Locator locator)
+ static void testLocator(HBaseTestingUtil util, TableName tableName, Locator locator)
throws Exception {
RegionLocations locs =
locator.getRegionLocations(tableName, RegionReplicaUtil.DEFAULT_REPLICA_ID, false);
@@ -185,7 +185,7 @@ public final class RegionReplicaTestHelper {
locator.getRegionLocations(tableName, 2, false).getRegionLocation(2).getServerName());
}
- public static void assertReplicaDistributed(HBaseTestingUtility util, Table t)
+ public static void assertReplicaDistributed(HBaseTestingUtil util, Table t)
throws IOException {
if (t.getDescriptor().getRegionReplication() <= 1) {
return;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RestoreSnapshotFromClientTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RestoreSnapshotFromClientTestBase.java
index 0b1ffde..f1ad462 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RestoreSnapshotFromClientTestBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/RestoreSnapshotFromClientTestBase.java
@@ -19,7 +19,7 @@ package org.apache.hadoop.hbase.client;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.master.snapshot.SnapshotManager;
@@ -37,7 +37,7 @@ import org.junit.rules.TestName;
* Base class for testing restore snapshot
*/
public class RestoreSnapshotFromClientTestBase {
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected final byte[] FAMILY = Bytes.toBytes("cf");
protected final byte[] TEST_FAMILY2 = Bytes.toBytes("cf2");
@@ -134,7 +134,7 @@ public class RestoreSnapshotFromClientTestBase {
return TEST_UTIL.countRows(table, families);
}
- protected void verifyRowCount(HBaseTestingUtility util, TableName tableName, long expectedRows)
+ protected void verifyRowCount(HBaseTestingUtil util, TableName tableName, long expectedRows)
throws IOException {
SnapshotTestingUtils.verifyRowCount(util, tableName, expectedRows);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/SnapshotWithAclTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/SnapshotWithAclTestBase.java
index cfdbf43..f0e47d1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/SnapshotWithAclTestBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/SnapshotWithAclTestBase.java
@@ -22,8 +22,8 @@ import java.util.List;
import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Coprocessor;
-import org.apache.hadoop.hbase.HBaseCommonTestingUtility;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
@@ -50,7 +50,7 @@ public abstract class SnapshotWithAclTestBase extends SecureTestUtil {
private static byte[] TEST_QUALIFIER = Bytes.toBytes("cq");
private static byte[] TEST_ROW = Bytes.toBytes(0);
- protected static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
// user is table owner. will have all permissions on table
private static User USER_OWNER;
@@ -253,9 +253,9 @@ public abstract class SnapshotWithAclTestBase extends SecureTestUtil {
@Test
public void testDeleteSnapshot() throws Exception {
- String testSnapshotName = HBaseCommonTestingUtility.getRandomUUID().toString();
+ String testSnapshotName = HBaseCommonTestingUtil.getRandomUUID().toString();
verifyAllowed(new AccessSnapshotAction(testSnapshotName), USER_OWNER);
- verifyDenied(new AccessSnapshotAction(HBaseCommonTestingUtility.getRandomUUID().toString()),
+ verifyDenied(new AccessSnapshotAction(HBaseCommonTestingUtil.getRandomUUID().toString()),
USER_RO, USER_RW, USER_NONE);
List<SnapshotDescription> snapshotDescriptions = TEST_UTIL.getAdmin().listSnapshots(
Pattern.compile(testSnapshotName));
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
index e5bf4b1..2230262 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.apache.hadoop.hbase.HBaseTestingUtility.countRows;
+import static org.apache.hadoop.hbase.HBaseTestingUtil.countRows;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
index 102e7e2..f967709 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java
@@ -37,8 +37,8 @@ import java.util.stream.Collectors;
import org.apache.hadoop.hbase.ClusterMetrics.Option;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableExistsException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotDisabledException;
@@ -394,7 +394,7 @@ public class TestAdmin2 extends TestAdminBase {
@Test
public void testMoveToPreviouslyAssignedRS() throws IOException, InterruptedException {
- MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
HMaster master = cluster.getMaster();
final TableName tableName = TableName.valueOf(name.getMethodName());
Admin localAdmin = createTable(tableName);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdminBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdminBase.java
index c379775..605efcd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdminBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdminBase.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.TableName;
@@ -32,7 +32,7 @@ import org.junit.rules.TestName;
public class TestAdminBase {
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static Admin ADMIN;
@Rule
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAlwaysSetScannerId.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAlwaysSetScannerId.java
index 2209326..ac1bdb6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAlwaysSetScannerId.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAlwaysSetScannerId.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.ipc.BlockingRpcCallback;
import org.apache.hadoop.hbase.ipc.HBaseRpcControllerImpl;
@@ -53,7 +53,7 @@ public class TestAlwaysSetScannerId {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAlwaysSetScannerId.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName TABLE_NAME = TableName.valueOf("test");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAppendFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAppendFromClientSide.java
index 78515c6..366990a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAppendFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAppendFromClientSide.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CellBuilderType;
import org.apache.hadoop.hbase.ExtendedCellBuilderFactory;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -47,7 +47,7 @@ public class TestAppendFromClientSide {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAppendFromClientSide.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static byte [] ROW = Bytes.toBytes("testRow");
private static byte [] FAMILY = Bytes.toBytes("testFamily");
private static byte [] QUALIFIER = Bytes.toBytes("testQualifier");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
index e895f16..a185501 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBase.java
@@ -26,9 +26,9 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ForkJoinPool;
import java.util.function.Supplier;
import java.util.regex.Pattern;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.StartMiniClusterOption;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.After;
@@ -50,7 +50,7 @@ import org.apache.hbase.thirdparty.com.google.common.io.Closeables;
public abstract class TestAsyncAdminBase extends AbstractTestUpdateConfiguration {
protected static final Logger LOG = LoggerFactory.getLogger(TestAsyncAdminBase.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static final byte[] FAMILY = Bytes.toBytes("testFamily");
protected static final byte[] FAMILY_0 = Bytes.toBytes("cf0");
protected static final byte[] FAMILY_1 = Bytes.toBytes("cf1");
@@ -85,7 +85,7 @@ public abstract class TestAsyncAdminBase extends AbstractTestUpdateConfiguration
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, 120000);
TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 2);
TEST_UTIL.getConfiguration().setInt(START_LOG_ERRORS_AFTER_COUNT_KEY, 0);
- StartMiniClusterOption option = StartMiniClusterOption.builder().numRegionServers(2).
+ StartTestingClusterOption option = StartTestingClusterOption.builder().numRegionServers(2).
numMasters(2).build();
TEST_UTIL.startMiniCluster(option);
ASYNC_CONN = ConnectionFactory.createAsyncConnection(TEST_UTIL.getConfiguration()).get();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBuilder.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBuilder.java
index d4d0703..f084eec 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBuilder.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminBuilder.java
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Supplier;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;
@@ -63,7 +63,7 @@ public class TestAsyncAdminBuilder {
HBaseClassTestRule.forClass(TestAsyncAdminBuilder.class);
private static final Logger LOG = LoggerFactory.getLogger(TestAsyncAdminBuilder.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static AsyncConnection ASYNC_CONN;
@Parameter
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java
index c447510..81dafae 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncAdminWithRegionReplicas.java
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
@@ -53,7 +53,7 @@ public class TestAsyncAdminWithRegionReplicas extends TestAsyncAdminBase {
@BeforeClass
public static void setUpBeforeClass() throws Exception {
TestAsyncAdminBase.setUpBeforeClass();
- HBaseTestingUtility.setReplicas(TEST_UTIL.getAdmin(), TableName.META_TABLE_NAME, 3);
+ HBaseTestingUtil.setReplicas(TEST_UTIL.getAdmin(), TableName.META_TABLE_NAME, 3);
try (ConnectionRegistry registry =
ConnectionRegistryFactory.getRegistry(TEST_UTIL.getConfiguration())) {
RegionReplicaTestHelper.waitUntilAllMetaReplicasAreReady(TEST_UTIL, registry);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncBufferMutator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncBufferMutator.java
index 874a01c..602bc62 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncBufferMutator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncBufferMutator.java
@@ -37,7 +37,7 @@ import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -58,7 +58,7 @@ public class TestAsyncBufferMutator {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncBufferMutator.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClientPauseForCallQueueTooBig.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClientPauseForCallQueueTooBig.java
index 075e1bc..675c9e1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClientPauseForCallQueueTooBig.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClientPauseForCallQueueTooBig.java
@@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Abortable;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.ipc.CallRunner;
@@ -64,7 +64,7 @@ public class TestAsyncClientPauseForCallQueueTooBig {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncClientPauseForCallQueueTooBig.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("CQTBE");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
index 808bc5d..1fd0b0d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClusterAdminApi.java
@@ -32,7 +32,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.ClusterMetrics;
import org.apache.hadoop.hbase.ClusterMetrics.Option;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.RegionMetrics;
import org.apache.hadoop.hbase.ServerMetrics;
@@ -323,7 +323,7 @@ public class TestAsyncClusterAdminApi extends TestAsyncAdminBase {
admin.createTable(builder.build(), Bytes.toBytes("aaaaa"), Bytes.toBytes("zzzzz"), 16).join();
AsyncTable<?> asyncTable = ASYNC_CONN.getTable(table);
List<Put> puts = new ArrayList<>();
- for (byte[] row : HBaseTestingUtility.ROWS) {
+ for (byte[] row : HBaseTestingUtil.ROWS) {
puts.add(new Put(row).addColumn(FAMILY, Bytes.toBytes("q"), Bytes.toBytes("v")));
}
asyncTable.putAll(puts).join();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncMetaRegionLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncMetaRegionLocator.java
index 1506707..480d797 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncMetaRegionLocator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncMetaRegionLocator.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.client.RegionReplicaTestHelper.testLocator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.RegionLocations;
import org.apache.hadoop.hbase.TableName;
@@ -42,7 +42,7 @@ public class TestAsyncMetaRegionLocator {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncMetaRegionLocator.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static ConnectionRegistry REGISTRY;
@@ -51,7 +51,7 @@ public class TestAsyncMetaRegionLocator {
@BeforeClass
public static void setUp() throws Exception {
TEST_UTIL.startMiniCluster(3);
- HBaseTestingUtility.setReplicas(TEST_UTIL.getAdmin(), TableName.META_TABLE_NAME, 3);
+ HBaseTestingUtil.setReplicas(TEST_UTIL.getAdmin(), TableName.META_TABLE_NAME, 3);
TEST_UTIL.waitUntilNoRegionsInTransition();
REGISTRY = ConnectionRegistryFactory.getRegistry(TEST_UTIL.getConfiguration());
RegionReplicaTestHelper.waitUntilAllMetaReplicasAreReady(TEST_UTIL, REGISTRY);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocator.java
index 99d98c9..44b954e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocator.java
@@ -37,7 +37,7 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.IntStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.NotServingRegionException;
import org.apache.hadoop.hbase.RegionLocations;
@@ -74,7 +74,7 @@ public class TestAsyncNonMetaRegionLocator {
private static final Logger LOG = LoggerFactory.getLogger(TestAsyncNonMetaRegionLocator.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
@@ -103,7 +103,7 @@ public class TestAsyncNonMetaRegionLocator {
admin.balancerSwitch(false, true);
// Enable hbase:meta replication.
- HBaseTestingUtility.setReplicas(admin, TableName.META_TABLE_NAME, numOfMetaReplica);
+ HBaseTestingUtil.setReplicas(admin, TableName.META_TABLE_NAME, numOfMetaReplica);
TEST_UTIL.waitFor(30000, () -> TEST_UTIL.getMiniHBaseCluster().getRegions(
TableName.META_TABLE_NAME).size() >= numOfMetaReplica);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocatorConcurrenyLimit.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocatorConcurrenyLimit.java
index 6aad76c..690a384 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocatorConcurrenyLimit.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncNonMetaRegionLocatorConcurrenyLimit.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.IntStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.RegionLocations;
import org.apache.hadoop.hbase.TableName;
@@ -63,7 +63,7 @@ public class TestAsyncNonMetaRegionLocatorConcurrenyLimit {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncNonMetaRegionLocatorConcurrenyLimit.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionLocator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionLocator.java
index bdc688e..0a0885e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionLocator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncRegionLocator.java
@@ -34,7 +34,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotFoundException;
@@ -64,7 +64,7 @@ public class TestAsyncRegionLocator {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncRegionLocator.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java
index c959963..6337bd0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncReplicationAdminApiWithClusters.java
@@ -33,7 +33,7 @@ import java.util.regex.Pattern;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotFoundException;
@@ -64,7 +64,7 @@ public class TestAsyncReplicationAdminApiWithClusters extends TestAsyncAdminBase
private final static String ID_SECOND = "2";
- private static HBaseTestingUtility TEST_UTIL2;
+ private static HBaseTestingUtil TEST_UTIL2;
private static Configuration conf2;
private static AsyncAdmin admin2;
private static AsyncConnection connection;
@@ -80,7 +80,7 @@ public class TestAsyncReplicationAdminApiWithClusters extends TestAsyncAdminBase
conf2 = HBaseConfiguration.create(TEST_UTIL.getConfiguration());
conf2.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/2");
- TEST_UTIL2 = new HBaseTestingUtility(conf2);
+ TEST_UTIL2 = new HBaseTestingUtil(conf2);
TEST_UTIL2.startMiniCluster();
connection =
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSingleRequestRpcRetryingCaller.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSingleRequestRpcRetryingCaller.java
index 58c6a04..9da38ae 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSingleRequestRpcRetryingCaller.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncSingleRequestRpcRetryingCaller.java
@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.security.User;
@@ -52,7 +52,7 @@ public class TestAsyncSingleRequestRpcRetryingCaller {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncSingleRequestRpcRetryingCaller.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTable.java
index 50f30d6..d37f3c3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTable.java
@@ -43,7 +43,7 @@ import java.util.function.Supplier;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNotEnabledException;
import org.apache.hadoop.hbase.filter.BinaryComparator;
@@ -81,7 +81,7 @@ public class TestAsyncTable {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTable.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java
index 78dbf0b..e6544b2 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatch.java
@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
@@ -74,7 +74,7 @@ public class TestAsyncTableBatch {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableBatch.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatchRetryImmediately.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatchRetryImmediately.java
index 028b8fd..d9c4bc9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatchRetryImmediately.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableBatchRetryImmediately.java
@@ -26,7 +26,7 @@ import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.logging.Log4jUtils;
@@ -46,7 +46,7 @@ public class TestAsyncTableBatchRetryImmediately {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableBatchRetryImmediately.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java
index 6c84b0a..ca11ea6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableGetMultiThreaded.java
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.MemoryCompactionPolicy;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
@@ -72,7 +72,7 @@ public class TestAsyncTableGetMultiThreaded {
private static final Logger LOG = LoggerFactory.getLogger(TestAsyncTableGetMultiThreaded.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final TableName TABLE_NAME = TableName.valueOf("async");
private static final byte[] FAMILY = Bytes.toBytes("cf");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocatePrefetch.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocatePrefetch.java
index 6c6bb98..245d755 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocatePrefetch.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocatePrefetch.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull;
import java.util.concurrent.ExecutionException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -41,7 +41,7 @@ public class TestAsyncTableLocatePrefetch {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableLocatePrefetch.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
@@ -75,7 +75,7 @@ public class TestAsyncTableLocatePrefetch {
Thread.sleep(1000);
// confirm that the locations of all the regions have been cached.
assertNotNull(LOCATOR.getRegionLocationInCache(TABLE_NAME, Bytes.toBytes("aaa")));
- for (byte[] row : HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE) {
+ for (byte[] row : HBaseTestingUtil.KEYS_FOR_HBA_CREATE_TABLE) {
assertNotNull(LOCATOR.getRegionLocationInCache(TABLE_NAME, row));
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocateRegionForDeletedTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocateRegionForDeletedTable.java
index ac647c6..ad52e63 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocateRegionForDeletedTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableLocateRegionForDeletedTable.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -46,7 +46,7 @@ public class TestAsyncTableLocateRegionForDeletedTable {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableLocateRegionForDeletedTable.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableNoncedRetry.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableNoncedRetry.java
index 9bc4150..a384bf1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableNoncedRetry.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableNoncedRetry.java
@@ -29,7 +29,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
@@ -58,7 +58,7 @@ public class TestAsyncTableNoncedRetry {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableNoncedRetry.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableRSCrashPublish.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableRSCrashPublish.java
index 461bf1b..6c538f5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableRSCrashPublish.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableRSCrashPublish.java
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.util.concurrent.ExecutionException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
@@ -45,7 +45,7 @@ public class TestAsyncTableRSCrashPublish {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableRSCrashPublish.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("Publish");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanException.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanException.java
index 3dbb1d0..893c383 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanException.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanException.java
@@ -29,7 +29,7 @@ import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor;
@@ -56,7 +56,7 @@ public class TestAsyncTableScanException {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableScanException.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("scan");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanMetrics.java
index f5aa196..6420806 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanMetrics.java
@@ -26,7 +26,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.concurrent.ForkJoinPool;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.PrivateCellUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.client.metrics.ScanMetrics;
@@ -54,7 +54,7 @@ public class TestAsyncTableScanMetrics {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableScanMetrics.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName TABLE_NAME = TableName.valueOf("ScanMetrics");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanRenewLease.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanRenewLease.java
index 8a05e19..0936bbe 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanRenewLease.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScanRenewLease.java
@@ -24,7 +24,7 @@ import java.util.List;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
@@ -44,7 +44,7 @@ public class TestAsyncTableScanRenewLease {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableScanRenewLease.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScannerCloseWhileSuspending.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScannerCloseWhileSuspending.java
index 4ac0856..10b6b62 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScannerCloseWhileSuspending.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableScannerCloseWhileSuspending.java
@@ -23,7 +23,7 @@ import java.util.concurrent.ForkJoinPool;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter.ExplainingPredicate;
import org.apache.hadoop.hbase.testclassification.ClientTests;
@@ -42,7 +42,7 @@ public class TestAsyncTableScannerCloseWhileSuspending {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableScannerCloseWhileSuspending.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("async");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableUseMetaReplicas.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableUseMetaReplicas.java
index 47d6ddb..61bb163 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableUseMetaReplicas.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAsyncTableUseMetaReplicas.java
@@ -25,7 +25,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
@@ -52,7 +52,7 @@ public class TestAsyncTableUseMetaReplicas {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAsyncTableUseMetaReplicas.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("Replica");
@@ -91,7 +91,7 @@ public class TestAsyncTableUseMetaReplicas {
conf.setStrings(CoprocessorHost.REGION_COPROCESSOR_CONF_KEY,
FailPrimaryMetaScanCp.class.getName());
UTIL.startMiniCluster(3);
- HBaseTestingUtility.setReplicas(UTIL.getAdmin(), TableName.META_TABLE_NAME, 3);
+ HBaseTestingUtil.setReplicas(UTIL.getAdmin(), TableName.META_TABLE_NAME, 3);
try (ConnectionRegistry registry = ConnectionRegistryFactory.getRegistry(conf)) {
RegionReplicaTestHelper.waitUntilAllMetaReplicasAreReady(UTIL, registry);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java
index 34b45f0..18e0b5c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAvoidCellReferencesIntoShippedBlocks.java
@@ -30,7 +30,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellComparatorImpl;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
@@ -72,7 +72,7 @@ public class TestAvoidCellReferencesIntoShippedBlocks {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestAvoidCellReferencesIntoShippedBlocks.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
static byte[][] ROWS = new byte[2][];
private static byte[] ROW = Bytes.toBytes("testRow");
private static byte[] ROW1 = Bytes.toBytes("testRow1");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java
index 48b16ff..a69bc4d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBlockEvictionFromClient.java
@@ -34,7 +34,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
@@ -83,7 +83,7 @@ public class TestBlockEvictionFromClient {
HBaseClassTestRule.forClass(TestBlockEvictionFromClient.class);
private static final Logger LOG = LoggerFactory.getLogger(TestBlockEvictionFromClient.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
static byte[][] ROWS = new byte[2][];
private static int NO_OF_THREADS = 3;
private static byte[] ROW = Bytes.toBytes("testRow");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBufferedMutator.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBufferedMutator.java
index 3c660d9..03f32b0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBufferedMutator.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestBufferedMutator.java
@@ -23,7 +23,7 @@ import java.io.IOException;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -41,7 +41,7 @@ public class TestBufferedMutator {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestBufferedMutator.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static TableName TABLE_NAME = TableName.valueOf("test");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCatalogReplicaLoadBalanceSimpleSelector.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCatalogReplicaLoadBalanceSimpleSelector.java
index a0b49b9..bebc843 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCatalogReplicaLoadBalanceSimpleSelector.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCatalogReplicaLoadBalanceSimpleSelector.java
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.concurrent.TimeUnit;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.RegionLocations;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.security.User;
@@ -52,7 +52,7 @@ public class TestCatalogReplicaLoadBalanceSimpleSelector {
private static final Logger LOG = LoggerFactory.getLogger(
TestCatalogReplicaLoadBalanceSimpleSelector.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final int NB_SERVERS = 4;
private static int numOfMetaReplica = NB_SERVERS - 1;
@@ -71,7 +71,7 @@ public class TestCatalogReplicaLoadBalanceSimpleSelector {
admin.balancerSwitch(false, true);
// Enable hbase:meta replication.
- HBaseTestingUtility.setReplicas(admin, TableName.META_TABLE_NAME, numOfMetaReplica);
+ HBaseTestingUtil.setReplicas(admin, TableName.META_TABLE_NAME, numOfMetaReplica);
TEST_UTIL.waitFor(30000, () -> TEST_UTIL.getMiniHBaseCluster().getRegions(
TableName.META_TABLE_NAME).size() >= numOfMetaReplica);
@@ -110,7 +110,7 @@ public class TestCatalogReplicaLoadBalanceSimpleSelector {
RegionReplicaUtil.DEFAULT_REPLICA_ID);
// Change to No meta replica
- HBaseTestingUtility.setReplicas(admin, TableName.META_TABLE_NAME, 1);
+ HBaseTestingUtil.setReplicas(admin, TableName.META_TABLE_NAME, 1);
TEST_UTIL.waitFor(30000, () -> TEST_UTIL.getMiniHBaseCluster().getRegions(
TableName.META_TABLE_NAME).size() == 1);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
index 262b608..1c58db3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java
@@ -31,7 +31,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.filter.BinaryComparator;
import org.apache.hadoop.hbase.filter.FamilyFilter;
@@ -58,7 +58,7 @@ public class TestCheckAndMutate {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestCheckAndMutate.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final byte[] ROWKEY = Bytes.toBytes("12345");
private static final byte[] ROWKEY2 = Bytes.toBytes("67890");
private static final byte[] ROWKEY3 = Bytes.toBytes("abcde");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutateWithByteBuff.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutateWithByteBuff.java
index 876259f..de1d02b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutateWithByteBuff.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutateWithByteBuff.java
@@ -19,6 +19,7 @@ package org.apache.hadoop.hbase.client;
import static org.apache.hadoop.hbase.util.Threads.sleep;
import static org.junit.Assert.assertTrue;
+
import java.io.IOException;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
@@ -26,7 +27,7 @@ import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.io.ByteBuffAllocator;
@@ -60,7 +61,7 @@ public class TestCheckAndMutateWithByteBuff {
public TestName name = new TestName();
private static final byte[] CF = Bytes.toBytes("CF");
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final Configuration conf = TEST_UTIL.getConfiguration();
private static Admin admin = null;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCleanupMetaReplica.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCleanupMetaReplica.java
index 15815e4..dc92284 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCleanupMetaReplica.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCleanupMetaReplica.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals;
import java.util.List;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.MiscTests;
@@ -48,7 +48,7 @@ public class TestCleanupMetaReplica extends MetaWithReplicasTestBase {
ZKWatcher zkw = TEST_UTIL.getZooKeeperWatcher();
List<String> metaReplicaZnodes = zkw.getMetaReplicaNodes();
assertEquals(3, metaReplicaZnodes.size());
- HBaseTestingUtility.setReplicas(TEST_UTIL.getAdmin(), TableName.META_TABLE_NAME, 1);
+ HBaseTestingUtil.setReplicas(TEST_UTIL.getAdmin(), TableName.META_TABLE_NAME, 1);
metaReplicaZnodes = zkw.getMetaReplicaNodes();
assertEquals(1, metaReplicaZnodes.size());
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java
index 8af1f40..9de23a1b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientOperationInterrupt.java
@@ -28,7 +28,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -57,7 +57,7 @@ public class TestClientOperationInterrupt {
private static final Logger LOG = LoggerFactory.getLogger(TestClientOperationInterrupt.class);
- private static HBaseTestingUtility util;
+ private static HBaseTestingUtil util;
private static final TableName tableName = TableName.valueOf("test");
private static final byte[] dummy = Bytes.toBytes("dummy");
private static final byte[] row1 = Bytes.toBytes("r1");
@@ -83,7 +83,7 @@ public class TestClientOperationInterrupt {
conf = HBaseConfiguration.create();
conf.setStrings(CoprocessorHost.USER_REGION_COPROCESSOR_CONF_KEY,
TestCoprocessor.class.getName());
- util = new HBaseTestingUtility(conf);
+ util = new HBaseTestingUtil(conf);
util.startMiniCluster();
Admin admin = util.getAdmin();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java
index a47ebf3..e58a66f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java
@@ -22,9 +22,9 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.MiniHBaseCluster.MiniHBaseClusterRegionServer;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster.MiniHBaseClusterRegionServer;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.regionserver.RSRpcServices;
@@ -60,7 +60,7 @@ public class TestClientScannerRPCTimeout {
HBaseClassTestRule.forClass(TestClientScannerRPCTimeout.class);
private static final Logger LOG = LoggerFactory.getLogger(TestClientScannerRPCTimeout.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final byte[] FAMILY = Bytes.toBytes("testFamily");
private static final byte[] QUALIFIER = Bytes.toBytes("testQualifier");
private static final byte[] VALUE = Bytes.toBytes("testValue");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java
index 5958d38..610fa7b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientTimeouts.java
@@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.exceptions.MasterRegistryFetchException;
@@ -60,7 +60,7 @@ public class TestClientTimeouts {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestClientTimeouts.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
protected static int SLAVES = 1;
@BeforeClass
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnection.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnection.java
index 3eecb69..662790d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnection.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestConnection.java
@@ -32,7 +32,7 @@ import java.util.stream.IntStream;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.ServerName;
@@ -75,7 +75,7 @@ public class TestConnection {
HBaseClassTestRule.forClass(TestConnection.class);
private static final Logger LOG = LoggerFactory.getLogger(TestConnection.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final byte[] FAM_NAM = Bytes.toBytes("f");
private static final byte[] ROW = Bytes.toBytes("bbb");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java
index b8ebccd..8fd2566 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestDropTimeoutRequest.java
@@ -23,7 +23,7 @@ import java.util.Optional;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.ObserverContext;
@@ -59,7 +59,7 @@ public class TestDropTimeoutRequest {
public TestName name = new TestName();
private static final Logger LOG = LoggerFactory.getLogger(TestDropTimeoutRequest.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final byte[] FAM_NAM = Bytes.toBytes("f");
private static final int RPC_RETRY = 5;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestEnableTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestEnableTable.java
index 25e8be2..006f2e6 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestEnableTable.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestEnableTable.java
@@ -24,7 +24,7 @@ import java.io.IOException;
import java.util.Optional;
import java.util.concurrent.CountDownLatch;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MetaTableAccessor;
import org.apache.hadoop.hbase.TableName;
@@ -53,7 +53,7 @@ public class TestEnableTable {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestEnableTable.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final Logger LOG = LoggerFactory.getLogger(TestEnableTable.class);
private static final byte[] FAMILYNAME = Bytes.toBytes("fam");
@@ -85,7 +85,7 @@ public class TestEnableTable {
TableDescriptor tableDescriptor = TableDescriptorBuilder.newBuilder(tableName)
.setColumnFamily(ColumnFamilyDescriptorBuilder.of(FAMILYNAME)).build();
try {
- createTable(TEST_UTIL, tableDescriptor, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE);
+ createTable(TEST_UTIL, tableDescriptor, HBaseTestingUtil.KEYS_FOR_HBA_CREATE_TABLE);
} catch (Exception e) {
LOG.error("", e);
fail("Got an exception while creating " + tableName);
@@ -158,7 +158,7 @@ public class TestEnableTable {
}
}
- public static void createTable(HBaseTestingUtility testUtil, TableDescriptor tableDescriptor,
+ public static void createTable(HBaseTestingUtil testUtil, TableDescriptor tableDescriptor,
byte[][] splitKeys) throws Exception {
// NOTE: We need a latch because admin is not sync,
// so the postOp coprocessor method may be called after the admin operation returned.
@@ -176,7 +176,7 @@ public class TestEnableTable {
testUtil.waitUntilAllRegionsAssigned(tableDescriptor.getTableName());
}
- public static void deleteTable(HBaseTestingUtility testUtil, TableName tableName)
+ public static void deleteTable(HBaseTestingUtil testUtil, TableName tableName)
throws Exception {
// NOTE: We need a latch because admin is not sync,
// so the postOp coprocessor method may be called after the admin operation returned.
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFailedMetaReplicaAssigment.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFailedMetaReplicaAssigment.java
index 18235eb..e336554 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFailedMetaReplicaAssigment.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFailedMetaReplicaAssigment.java
@@ -27,9 +27,9 @@ import java.util.Collections;
import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.StartMiniClusterOption;
+import org.apache.hadoop.hbase.StartTestingClusterOption;
import org.apache.hadoop.hbase.master.HMaster;
import org.apache.hadoop.hbase.master.MasterServices;
import org.apache.hadoop.hbase.master.assignment.AssignmentManager;
@@ -54,7 +54,7 @@ public class TestFailedMetaReplicaAssigment {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFailedMetaReplicaAssigment.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@BeforeClass
public static void setUp() throws Exception {
@@ -62,8 +62,9 @@ public class TestFailedMetaReplicaAssigment {
// this test can be removed once we remove the HConstants.META_REPLICAS_NUM config.
Configuration conf = TEST_UTIL.getConfiguration();
conf.setInt(HConstants.META_REPLICAS_NUM, 3);
- StartMiniClusterOption option = StartMiniClusterOption.builder().numAlwaysStandByMasters(1)
- .numMasters(1).numRegionServers(1).masterClass(BrokenMetaReplicaMaster.class).build();
+ StartTestingClusterOption option =
+ StartTestingClusterOption.builder().numAlwaysStandByMasters(1).numMasters(1)
+ .numRegionServers(1).masterClass(BrokenMetaReplicaMaster.class).build();
TEST_UTIL.startMiniCluster(option);
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFlushFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFlushFromClient.java
index cd496be..61520d3 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFlushFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFlushFromClient.java
@@ -26,7 +26,7 @@ import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
@@ -56,7 +56,7 @@ public class TestFlushFromClient {
HBaseClassTestRule.forClass(TestFlushFromClient.class);
private static final Logger LOG = LoggerFactory.getLogger(TestFlushFromClient.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static AsyncConnection asyncConn;
private static final byte[][] SPLITS = new byte[][]{Bytes.toBytes("3"), Bytes.toBytes("7")};
private static final List<byte[]> ROWS = Arrays.asList(
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
index 87ad7db..e5bf90b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.hbase.client;
-import static org.apache.hadoop.hbase.HBaseTestingUtility.countRows;
+import static org.apache.hadoop.hbase.HBaseTestingUtil.countRows;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -38,7 +38,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.KeepDeletedCells;
@@ -136,19 +136,19 @@ public class TestFromClientSide extends FromClientSideBase {
Table table = connection.getTableBuilder(name.getTableName(), null).
setOperationTimeout(3 * 1000).build()) {
Append append = new Append(ROW);
- append.addColumn(HBaseTestingUtility.fam1, QUALIFIER, VALUE);
+ append.addColumn(HBaseTestingUtil.fam1, QUALIFIER, VALUE);
Result result = table.append(append);
// Verify expected result
Cell[] cells = result.rawCells();
assertEquals(1, cells.length);
- assertKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, VALUE);
+ assertKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, VALUE);
// Verify expected result again
Result readResult = table.get(new Get(ROW));
cells = readResult.rawCells();
assertEquals(1, cells.length);
- assertKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, VALUE);
+ assertKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, VALUE);
}
}
@@ -179,7 +179,7 @@ public class TestFromClientSide extends FromClientSideBase {
Table table = connection.getTableBuilder(name.getTableName(), null).
setOperationTimeout(3 * 1000).build()) {
Append append = new Append(ROW);
- append.addColumn(HBaseTestingUtility.fam1, QUALIFIER, VALUE);
+ append.addColumn(HBaseTestingUtil.fam1, QUALIFIER, VALUE);
// Batch append
Object[] results = new Object[1];
@@ -188,13 +188,13 @@ public class TestFromClientSide extends FromClientSideBase {
// Verify expected result
Cell[] cells = ((Result) results[0]).rawCells();
assertEquals(1, cells.length);
- assertKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, VALUE);
+ assertKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, VALUE);
// Verify expected result again
Result readResult = table.get(new Get(ROW));
cells = readResult.rawCells();
assertEquals(1, cells.length);
- assertKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, VALUE);
+ assertKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, VALUE);
}
}
@@ -340,9 +340,9 @@ public class TestFromClientSide extends FromClientSideBase {
try (Table ht = TEST_UTIL.createTable(tableName, FAMILIES)) {
String value = "this is the value";
String value2 = "this is some other value";
- String keyPrefix1 = HBaseTestingUtility.getRandomUUID().toString();
- String keyPrefix2 = HBaseTestingUtility.getRandomUUID().toString();
- String keyPrefix3 = HBaseTestingUtility.getRandomUUID().toString();
+ String keyPrefix1 = HBaseTestingUtil.getRandomUUID().toString();
+ String keyPrefix2 = HBaseTestingUtil.getRandomUUID().toString();
+ String keyPrefix3 = HBaseTestingUtil.getRandomUUID().toString();
putRows(ht, 3, value, keyPrefix1);
putRows(ht, 3, value, keyPrefix2);
putRows(ht, 3, value, keyPrefix3);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
index 6b7a806..ddfa375 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java
@@ -42,7 +42,7 @@ import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.HRegionLocation;
import org.apache.hadoop.hbase.RegionMetrics;
@@ -91,8 +91,8 @@ public class TestFromClientSide3 {
HBaseClassTestRule.forClass(TestFromClientSide3.class);
private static final Logger LOG = LoggerFactory.getLogger(TestFromClientSide3.class);
- private final static HBaseTestingUtility TEST_UTIL
- = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL
+ = new HBaseTestingUtil();
private static final int WAITTABLE_MILLIS = 10000;
private static byte[] FAMILY = Bytes.toBytes("testFamily");
private static Random random = new Random();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
index c101599..6ce1939 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide4.java
@@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.ClusterMetrics.Option;
import org.apache.hadoop.hbase.HBaseClassTestRule;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.MiniHBaseCluster;
+import org.apache.hadoop.hbase.SingleProcessHBaseCluster;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.TableNameTestRule;
import org.apache.hadoop.hbase.coprocessor.MultiRowMutationEndpoint;
@@ -1241,7 +1241,7 @@ public class TestFromClientSide4 extends FromClientSideBase {
}
// stop the master
- MiniHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
+ SingleProcessHBaseCluster cluster = TEST_UTIL.getHBaseCluster();
cluster.stopMaster(0, false);
cluster.waitOnMaster(0);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java
index 74bb57d..9990f87 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideNoCodec.java
@@ -24,7 +24,7 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.CellScanner;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.ipc.AbstractRpcClient;
import org.apache.hadoop.hbase.testclassification.ClientTests;
@@ -49,7 +49,7 @@ public class TestFromClientSideNoCodec {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFromClientSideNoCodec.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java
index a4f79e7..c493241 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSideScanExcpetion.java
@@ -35,7 +35,7 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.exceptions.ScannerResetException;
@@ -66,7 +66,7 @@ public class TestFromClientSideScanExcpetion {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestFromClientSideScanExcpetion.class);
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static byte[] FAMILY = Bytes.toBytes("testFamily");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetProcedureResult.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetProcedureResult.java
index f2979e4..a6f3e22 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetProcedureResult.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetProcedureResult.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import java.io.IOException;
import java.util.concurrent.CountDownLatch;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.MasterNotRunningException;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.Waiter;
@@ -56,7 +56,7 @@ public class TestGetProcedureResult {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestGetProcedureResult.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
public static final class DummyProcedure extends Procedure<MasterProcedureEnv>
implements TableProcedureInterface {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanColumnsWithNewVersionBehavior.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanColumnsWithNewVersionBehavior.java
index f256a87..cb4b260 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanColumnsWithNewVersionBehavior.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanColumnsWithNewVersionBehavior.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.assertArrayEquals;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.Cell;
@@ -47,7 +47,7 @@ public class TestGetScanColumnsWithNewVersionBehavior {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestGetScanColumnsWithNewVersionBehavior.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final TableName TABLE = TableName.valueOf("table");
private static final byte[] CF = { 'c', 'f' };
private static final byte[] ROW = { 'r', 'o', 'w' };
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanPartialResult.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanPartialResult.java
index 63976e0..222cd12 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanPartialResult.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestGetScanPartialResult.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -44,7 +44,7 @@ public class TestGetScanPartialResult {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestGetScanPartialResult.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final TableName TABLE = TableName.valueOf("table");
private static final byte[] CF = { 'c', 'f' };
private static final byte[] ROW = { 'r', 'o', 'w' };
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
index cc2c8f2..4d3cd39 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestHbck.java
@@ -31,7 +31,7 @@ import java.util.stream.Collectors;
import org.apache.hadoop.hbase.Coprocessor;
import org.apache.hadoop.hbase.CoprocessorEnvironment;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor;
@@ -79,7 +79,7 @@ public class TestHbck {
public static final HBaseClassTestRule CLASS_RULE = HBaseClassTestRule.forClass(TestHbck.class);
private static final Logger LOG = LoggerFactory.getLogger(TestHbck.class);
- private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
@Rule
public TestName name = new TestName();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java
index 1a9e5b5..2ea8852 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIllegalTableDescriptor.java
@@ -28,7 +28,7 @@ import java.io.IOException;
import java.lang.reflect.Field;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
@@ -54,7 +54,7 @@ public class TestIllegalTableDescriptor {
// NOTE: Increment tests were moved to their own class, TestIncrementsFromClientSide.
private static final Logger LOGGER;
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static byte [] FAMILY = Bytes.toBytes("testFamily");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIncrementsFromClientSide.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIncrementsFromClientSide.java
index 3ffe5fc..fdfe2df 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIncrementsFromClientSide.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIncrementsFromClientSide.java
@@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.CellBuilderType;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.ExtendedCellBuilderFactory;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.PrivateCellUtil;
@@ -76,7 +76,7 @@ public class TestIncrementsFromClientSide {
HBaseClassTestRule.forClass(TestIncrementsFromClientSide.class);
final Logger LOG = LoggerFactory.getLogger(getClass());
- protected final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ protected final static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static byte [] ROW = Bytes.toBytes("testRow");
private static byte [] FAMILY = Bytes.toBytes("testFamily");
private static byte [] QUALIFIER = Bytes.toBytes("testQualifier");
@@ -127,18 +127,18 @@ public class TestIncrementsFromClientSide {
Table table = connection.getTableBuilder(TableName.valueOf(name.getMethodName()), null)
.setOperationTimeout(3 * 1000).build()) {
Increment inc = new Increment(ROW);
- inc.addColumn(HBaseTestingUtility.fam1, QUALIFIER, 1);
+ inc.addColumn(HBaseTestingUtil.fam1, QUALIFIER, 1);
Result result = table.increment(inc);
Cell[] cells = result.rawCells();
assertEquals(1, cells.length);
- assertIncrementKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, 1);
+ assertIncrementKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, 1);
// Verify expected result
Result readResult = table.get(new Get(ROW));
cells = readResult.rawCells();
assertEquals(1, cells.length);
- assertIncrementKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, 1);
+ assertIncrementKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, 1);
}
}
@@ -167,7 +167,7 @@ public class TestIncrementsFromClientSide {
Table table = connection.getTableBuilder(TableName.valueOf(name.getMethodName()), null)
.setOperationTimeout(3 * 1000).build()) {
Increment inc = new Increment(ROW);
- inc.addColumn(HBaseTestingUtility.fam1, QUALIFIER, 1);
+ inc.addColumn(HBaseTestingUtil.fam1, QUALIFIER, 1);
// Batch increment
Object[] results = new Object[1];
@@ -175,13 +175,13 @@ public class TestIncrementsFromClientSide {
Cell[] cells = ((Result) results[0]).rawCells();
assertEquals(1, cells.length);
- assertIncrementKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, 1);
+ assertIncrementKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, 1);
// Verify expected result
Result readResult = table.get(new Get(ROW));
cells = readResult.rawCells();
assertEquals(1, cells.length);
- assertIncrementKey(cells[0], ROW, HBaseTestingUtility.fam1, QUALIFIER, 1);
+ assertIncrementKey(cells[0], ROW, HBaseTestingUtil.fam1, QUALIFIER, 1);
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java
index 7cada26..748d896 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestIntraRowPagination.java
@@ -21,7 +21,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.hadoop.hbase.Cell;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HTestConst;
import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.TableName;
@@ -43,7 +43,7 @@ public class TestIntraRowPagination {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestIntraRowPagination.class);
- private static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
/**
* Test from client side for scan with maxResultPerCF set
@@ -62,7 +62,7 @@ public class TestIntraRowPagination {
for (byte[] family : FAMILIES) {
builder.setColumnFamily(ColumnFamilyDescriptorBuilder.of(family));
}
- HRegion region = HBaseTestingUtility.createRegionAndWAL(info, TEST_UTIL.getDataTestDir(),
+ HRegion region = HBaseTestingUtil.createRegionAndWAL(info, TEST_UTIL.getDataTestDir(),
TEST_UTIL.getConfiguration(), builder.build());
try {
Put put;
@@ -103,7 +103,7 @@ public class TestIntraRowPagination {
TestScannersFromClientSide.verifyResult(result, kvListExp, toLog,
"Testing scan with storeOffset and storeLimit");
} finally {
- HBaseTestingUtility.closeRegionAndWAL(region);
+ HBaseTestingUtil.closeRegionAndWAL(region);
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestInvalidMutationDurabilityException.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestInvalidMutationDurabilityException.java
index e22f6dc..f5142cd 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestInvalidMutationDurabilityException.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestInvalidMutationDurabilityException.java
@@ -19,7 +19,7 @@
package org.apache.hadoop.hbase.client;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.regionserver.InvalidMutationDurabilityException;
@@ -39,7 +39,7 @@ public class TestInvalidMutationDurabilityException {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestInvalidMutationDurabilityException.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static TableName TABLE_NOT_REPLICATE = TableName.valueOf("TableNotReplicate");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestLimitedScanWithFilter.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestLimitedScanWithFilter.java
index 9d871d2..cecd87f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestLimitedScanWithFilter.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestLimitedScanWithFilter.java
@@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.testclassification.ClientTests;
import org.apache.hadoop.hbase.testclassification.MediumTests;
@@ -48,7 +48,7 @@ public class TestLimitedScanWithFilter {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestLimitedScanWithFilter.class);
- private static final HBaseTestingUtility UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
private static final TableName TABLE_NAME = TableName.valueOf("TestRegionScanner");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java
index c510415..20ee199 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMalformedCellFromClient.java
@@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.CompareOperator;
import org.apache.hadoop.hbase.DoNotRetryIOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
+import org.apache.hadoop.hbase.HBaseTestingUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.ipc.HBaseRpcController;
@@ -68,7 +68,7 @@ public class TestMalformedCellFromClient {
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestMalformedCellFromClient.class);
- private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility();
+ private static final HBaseTestingUtil TEST_UTIL = new HBaseTestingUtil();
private static final byte[] FAMILY = Bytes.toBytes("testFamily");
private static final int CELL_SIZE = 100;
private static final TableName TABLE_NAME = TableName.valueOf("TestMalformedCellFromClient");
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistry.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistry.java
index 359ad61..e4bdff9 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistry.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestMasterRegistry.java
@@ -30,11 +30,11 @@ import java.util.List;
import java.util.Set;
import org.apache.hadoop.conf.Configuration;
... 21296 lines suppressed ...