HBASE-19873 Add a CategoryBasedTimeout ClassRule for all UTs
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/918599ef Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/918599ef Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/918599ef Branch: refs/heads/master Commit: 918599ef12639be6e2e19dcb5af8d79b7721d970 Parents: 851e179 Author: zhangduo <zhang...@apache.org> Authored: Sun Jan 28 19:52:09 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Mon Jan 29 08:43:56 2018 +0800 ---------------------------------------------------------------------- ReorderImports.class | Bin 0 -> 5984 bytes .../exemplars/client/TestHelloHBase.java | 8 +- .../exemplars/shaded_client/TestHelloHBase.java | 8 +- .../hbase/backup/TestBackupBoundaryTests.java | 10 ++- .../hbase/backup/TestBackupCommandLineTool.java | 7 +- .../hadoop/hbase/backup/TestBackupDelete.java | 18 ++-- .../hbase/backup/TestBackupDeleteRestore.java | 33 ++++--- .../backup/TestBackupDeleteWithFailures.java | 12 ++- .../hadoop/hbase/backup/TestBackupDescribe.java | 18 ++-- .../hbase/backup/TestBackupHFileCleaner.java | 8 +- .../hbase/backup/TestBackupMultipleDeletes.java | 18 ++-- .../hadoop/hbase/backup/TestBackupRepair.java | 16 ++-- .../hbase/backup/TestBackupShowHistory.java | 18 ++-- .../hbase/backup/TestBackupSmallTests.java | 17 ++-- .../hbase/backup/TestBackupStatusProgress.java | 18 ++-- .../hbase/backup/TestBackupSystemTable.java | 9 +- .../hadoop/hbase/backup/TestFullBackup.java | 15 ++-- .../hadoop/hbase/backup/TestFullBackupSet.java | 17 ++-- .../backup/TestFullBackupSetRestoreSet.java | 16 ++-- .../backup/TestFullBackupWithFailures.java | 15 ++-- .../hadoop/hbase/backup/TestFullRestore.java | 33 ++++--- .../hbase/backup/TestIncrementalBackup.java | 18 ++-- .../TestIncrementalBackupDeleteTable.java | 18 ++-- .../TestIncrementalBackupMergeWithFailures.java | 16 ++-- .../TestIncrementalBackupWithBulkLoad.java | 17 ++-- .../TestIncrementalBackupWithFailures.java | 18 ++-- .../hadoop/hbase/backup/TestRemoteBackup.java | 33 ++++--- .../hadoop/hbase/backup/TestRemoteRestore.java | 31 +++++-- .../backup/TestRepairAfterFailedDelete.java | 18 ++-- .../hbase/backup/TestRestoreBoundaryTests.java | 9 +- .../hbase/backup/TestSystemTableSnapshot.java | 8 +- .../backup/master/TestBackupLogCleaner.java | 18 ++-- .../hadoop/hbase/TestHColumnDescriptor.java | 6 ++ .../hadoop/hbase/TestHTableDescriptor.java | 7 +- .../hbase/TestInterfaceAudienceAnnotations.java | 17 ++-- .../hadoop/hbase/TestRegionLocations.java | 6 +- .../hadoop/hbase/client/TestAsyncProcess.java | 15 ++-- .../hadoop/hbase/client/TestAttributes.java | 10 ++- .../hbase/client/TestBufferedMutator.java | 8 +- .../hbase/client/TestBufferedMutatorParams.java | 11 ++- .../client/TestClientExponentialBackoff.java | 15 +++- .../hbase/client/TestClientNoCluster.java | 10 ++- .../hadoop/hbase/client/TestClientScanner.java | 7 +- .../TestColumnFamilyDescriptorBuilder.java | 6 ++ .../hadoop/hbase/client/TestDelayingRunner.java | 9 +- .../hbase/client/TestDeleteTimeStamp.java | 32 ++++--- .../org/apache/hadoop/hbase/client/TestGet.java | 17 ++-- .../client/TestHTableMultiplexerViaMocks.java | 38 ++++---- .../client/TestImmutableHColumnDescriptor.java | 11 ++- .../hbase/client/TestImmutableHRegionInfo.java | 9 +- .../client/TestImmutableHTableDescriptor.java | 11 ++- .../hadoop/hbase/client/TestIncrement.java | 9 +- .../hadoop/hbase/client/TestInterfaceAlign.java | 9 +- .../hbase/client/TestMetricsConnection.java | 38 ++++---- .../hadoop/hbase/client/TestMutation.java | 8 +- .../hadoop/hbase/client/TestOperation.java | 10 ++- .../hbase/client/TestProcedureFuture.java | 15 ++-- .../hadoop/hbase/client/TestPutDotHas.java | 8 +- .../hbase/client/TestRegionInfoDisplay.java | 15 ++-- ...estRetriesExhaustedWithDetailsException.java | 30 +++---- .../client/TestReversedScannerCallable.java | 6 ++ .../hadoop/hbase/client/TestRowComparator.java | 7 ++ .../apache/hadoop/hbase/client/TestScan.java | 18 ++-- .../client/TestSimpleRequestController.java | 9 +- .../hbase/client/TestSnapshotFromAdmin.java | 13 ++- .../client/TestTableDescriptorBuilder.java | 10 ++- .../exceptions/TestClientExceptionsUtil.java | 15 ++-- .../hadoop/hbase/filter/TestComparators.java | 9 +- .../hadoop/hbase/filter/TestKeyOnlyFilter.java | 7 +- .../hadoop/hbase/filter/TestLongComparator.java | 16 ++-- .../hadoop/hbase/ipc/TestCellBlockBuilder.java | 7 +- .../hadoop/hbase/ipc/TestFailedServersLog.java | 32 ++++--- .../hbase/ipc/TestHBaseRpcControllerImpl.java | 8 +- .../apache/hadoop/hbase/ipc/TestIPCUtil.java | 7 +- .../ipc/TestRpcClientDeprecatedNameMapping.java | 6 ++ .../hadoop/hbase/quotas/TestQuotaFilter.java | 7 +- .../hbase/quotas/TestQuotaSettingsFactory.java | 31 ++++--- .../hbase/quotas/TestSpaceLimitSettings.java | 31 ++++--- .../hbase/quotas/TestThrottleSettings.java | 29 +++--- .../replication/TestReplicationPeerConfig.java | 7 +- .../hbase/security/TestEncryptionUtil.java | 11 ++- .../hbase/security/TestHBaseSaslRpcClient.java | 8 +- .../hadoop/hbase/security/TestSaslUtil.java | 11 ++- .../hbase/shaded/protobuf/TestProtobufUtil.java | 18 ++-- .../hadoop/hbase/zookeeper/TestZNodePaths.java | 6 ++ hbase-common/pom.xml | 11 --- .../hadoop/hbase/CategoryBasedTimeout.java | 78 ---------------- .../apache/hadoop/hbase/HBaseClassTestRule.java | 88 +++++++++++++++++++ .../hadoop/hbase/HBaseClassTestRuleChecker.java | 53 +++++++++++ .../hadoop/hbase/TestByteBufferKeyValue.java | 32 ++++--- .../apache/hadoop/hbase/TestCellBuilder.java | 6 +- .../apache/hadoop/hbase/TestCellComparator.java | 9 +- .../org/apache/hadoop/hbase/TestCellUtil.java | 7 +- .../apache/hadoop/hbase/TestChoreService.java | 8 +- .../apache/hadoop/hbase/TestClassFinder.java | 7 +- .../hadoop/hbase/TestCompoundConfiguration.java | 11 ++- .../hadoop/hbase/TestHBaseConfiguration.java | 8 +- .../hbase/TestIndividualBytesFieldCell.java | 8 +- .../org/apache/hadoop/hbase/TestTableName.java | 7 +- .../org/apache/hadoop/hbase/TestTagUtil.java | 6 +- .../org/apache/hadoop/hbase/TestTimeout.java | 13 ++- .../hadoop/hbase/codec/TestCellCodec.java | 7 +- .../hbase/codec/TestCellCodecWithTags.java | 6 ++ .../hadoop/hbase/codec/TestKeyValueCodec.java | 8 +- .../hbase/codec/TestKeyValueCodecWithTags.java | 6 ++ .../io/TestByteBufferListOutputStream.java | 7 +- .../hadoop/hbase/io/TestByteBufferPool.java | 7 +- .../hbase/io/TestMultiByteBuffInputStream.java | 7 +- .../hbase/io/TestTagCompressionContext.java | 8 +- .../hbase/io/crypto/TestCipherProvider.java | 32 ++++--- .../hadoop/hbase/io/crypto/TestEncryption.java | 32 ++++--- .../hadoop/hbase/io/crypto/TestKeyProvider.java | 32 ++++--- .../io/crypto/TestKeyStoreKeyProvider.java | 32 ++++--- .../hadoop/hbase/io/crypto/aes/TestAES.java | 32 ++++--- .../hbase/io/crypto/aes/TestCommonsAES.java | 32 ++++--- .../TestThrottledInputStream.java | 31 ++++--- .../hadoop/hbase/io/util/TestLRUDictionary.java | 9 +- .../hadoop/hbase/nio/TestMultiByteBuff.java | 9 +- .../hadoop/hbase/nio/TestSingleByteBuff.java | 9 +- .../hadoop/hbase/types/TestCopyOnWriteMaps.java | 8 +- .../hbase/types/TestFixedLengthWrapper.java | 8 +- .../hadoop/hbase/types/TestOrderedBlob.java | 6 ++ .../hadoop/hbase/types/TestOrderedBlobVar.java | 6 ++ .../hadoop/hbase/types/TestOrderedString.java | 6 ++ .../hadoop/hbase/types/TestRawString.java | 6 ++ .../apache/hadoop/hbase/types/TestStruct.java | 7 +- .../hbase/types/TestStructNullExtension.java | 7 +- .../hbase/types/TestTerminatedWrapper.java | 6 ++ .../apache/hadoop/hbase/types/TestUnion2.java | 6 ++ .../apache/hadoop/hbase/util/TestAvlUtil.java | 34 ++++--- .../apache/hadoop/hbase/util/TestBase64.java | 10 ++- .../hadoop/hbase/util/TestByteBufferArray.java | 7 +- .../hadoop/hbase/util/TestByteBufferUtils.java | 33 ++++--- .../util/TestByteRangeWithKVSerialization.java | 7 +- .../org/apache/hadoop/hbase/util/TestBytes.java | 9 +- .../hadoop/hbase/util/TestCommonFSUtils.java | 9 +- .../hbase/util/TestConcatenatedLists.java | 11 ++- .../hbase/util/TestCoprocessorClassLoader.java | 10 ++- .../apache/hadoop/hbase/util/TestCounter.java | 11 ++- .../hadoop/hbase/util/TestDrainBarrier.java | 9 +- .../hbase/util/TestDynamicClassLoader.java | 11 ++- .../hbase/util/TestEnvironmentEdgeManager.java | 9 +- .../hadoop/hbase/util/TestJRubyFormat.java | 11 ++- .../apache/hadoop/hbase/util/TestKeyLocker.java | 9 +- .../hbase/util/TestLoadTestKVGenerator.java | 32 ++++--- .../org/apache/hadoop/hbase/util/TestOrder.java | 7 +- .../hadoop/hbase/util/TestOrderedBytes.java | 7 +- .../hadoop/hbase/util/TestShowProperties.java | 10 ++- .../hbase/util/TestSimpleMutableByteRange.java | 8 +- .../TestSimplePositionedMutableByteRange.java | 8 +- .../apache/hadoop/hbase/util/TestThreads.java | 35 ++++---- .../hadoop/hbase/util/TestVersionInfo.java | 6 ++ .../hadoop/hbase/util/TestWeakObjectPool.java | 16 ++-- .../hadoop/hbase/zookeeper/TestZKConfig.java | 9 +- .../client/TestAsyncAggregationClient.java | 7 +- .../hbase/client/TestRpcControllerFactory.java | 15 ++-- .../TestAsyncCoprocessorEndpoint.java | 14 +-- .../TestBatchCoprocessorEndpoint.java | 16 ++-- .../hbase/coprocessor/TestClassLoading.java | 34 +++---- .../coprocessor/TestCoprocessorEndpoint.java | 16 ++-- ...CoprocessorServiceBackwardCompatibility.java | 27 +++--- .../TestCoprocessorTableEndpoint.java | 19 ++-- .../hbase/coprocessor/TestImportExport.java | 11 ++- .../TestRegionServerCoprocessorEndpoint.java | 15 ++-- .../coprocessor/TestRowProcessorEndpoint.java | 23 ++--- .../hbase/coprocessor/TestSecureExport.java | 18 ++-- .../hbase/ipc/TestCoprocessorRpcUtils.java | 11 ++- ...gionServerBulkLoadWithOldSecureEndpoint.java | 16 +++- .../regionserver/TestServerCustomProtocol.java | 20 +++-- ...ReplicationSyncUpToolWithBulkLoadedData.java | 32 ++++--- .../client/example/TestAsyncClientExample.java | 6 ++ .../client/example/TestHttpProxyExample.java | 11 ++- .../example/TestRefreshHFilesEndpoint.java | 15 ++-- .../example/TestScanModifyingObserver.java | 7 +- .../example/TestValueReplacingCompaction.java | 7 +- .../TestWriteHeavyIncrementObserver.java | 6 ++ ...IncrementObserverWithMemStoreCompaction.java | 6 ++ .../TestZooKeeperScanPolicyObserver.java | 7 +- .../hbase/mapreduce/TestMapReduceExamples.java | 44 ++++++---- .../apache/hadoop/hbase/types/TestPBCell.java | 10 ++- hbase-hadoop-compat/pom.xml | 6 ++ .../TestCompatibilitySingletonFactory.java | 7 +- .../master/TestMetricsMasterSourceFactory.java | 7 +- .../TestMetricsRegionServerSourceFactory.java | 7 +- .../regionserver/wal/TestMetricsWALSource.java | 7 +- .../TestMetricsReplicationSourceFactory.java | 7 +- .../hbase/rest/TestMetricsRESTSource.java | 8 +- .../TestMetricsThriftServerSourceFactory.java | 7 +- .../zookeeper/TestMetricsZooKeeperSource.java | 6 ++ hbase-hadoop2-compat/pom.xml | 6 ++ .../master/TestMetricsMasterProcSourceImpl.java | 13 ++- .../master/TestMetricsMasterSourceImpl.java | 15 ++-- .../hbase/metrics/TestBaseSourceImpl.java | 15 ++-- .../TestMetricsRegionServerSourceImpl.java | 15 ++-- .../TestMetricsRegionSourceImpl.java | 10 ++- .../TestMetricsTableSourceImpl.java | 9 +- .../wal/TestMetricsWALSourceImpl.java | 14 ++- ...TestMetricsReplicationSourceFactoryImpl.java | 14 ++- .../TestMetricsReplicationSourceImpl.java | 13 ++- .../hbase/rest/TestMetricsRESTSourceImpl.java | 15 ++-- ...estMetricsThriftServerSourceFactoryImpl.java | 17 ++-- .../TestMetricsZooKeeperSourceImpl.java | 6 ++ .../hadoop/hbase/http/TestGlobalFilter.java | 9 +- .../hadoop/hbase/http/TestHtmlQuoting.java | 7 +- .../hadoop/hbase/http/TestHttpRequestLog.java | 19 ++-- .../hbase/http/TestHttpRequestLogAppender.java | 10 ++- .../hadoop/hbase/http/TestHttpServer.java | 9 +- .../hbase/http/TestHttpServerLifecycle.java | 6 ++ .../hbase/http/TestHttpServerWebapps.java | 9 +- .../hadoop/hbase/http/TestPathFilter.java | 9 +- .../hadoop/hbase/http/TestSSLHttpServer.java | 11 ++- .../hadoop/hbase/http/TestServletFilter.java | 9 +- .../hadoop/hbase/http/TestSpnegoHttpServer.java | 26 +++--- .../hadoop/hbase/http/conf/TestConfServlet.java | 10 ++- .../hbase/http/jmx/TestJMXJsonServlet.java | 31 ++++--- .../hbase/http/lib/TestStaticUserWebFilter.java | 12 ++- .../hadoop/hbase/http/log/TestLogLevel.java | 40 +++++---- .../hadoop/hbase/TestIntegrationTestBase.java | 6 +- .../actions/TestChangeSplitPolicyAction.java | 7 ++ .../hadoop/hbase/TestPerformanceEvaluation.java | 22 +++-- .../apache/hadoop/hbase/mapred/TestDriver.java | 13 ++- .../hbase/mapred/TestGroupingTableMap.java | 14 +-- .../hbase/mapred/TestIdentityTableMap.java | 12 ++- .../TestMultiTableSnapshotInputFormat.java | 12 ++- .../hadoop/hbase/mapred/TestRowCounter.java | 12 ++- .../hadoop/hbase/mapred/TestSplitTable.java | 8 +- .../hbase/mapred/TestTableInputFormat.java | 8 +- .../hadoop/hbase/mapred/TestTableMapReduce.java | 15 ++-- .../hbase/mapred/TestTableMapReduceUtil.java | 13 ++- .../TestTableOutputFormatConnectionExhaust.java | 13 ++- .../mapred/TestTableSnapshotInputFormat.java | 14 +-- .../MultiTableInputFormatTestBase.java | 8 +- .../TableSnapshotInputFormatTestBase.java | 14 +-- .../hadoop/hbase/mapreduce/TestCellCounter.java | 19 ++-- .../hadoop/hbase/mapreduce/TestCopyTable.java | 8 +- .../mapreduce/TestGroupingTableMapper.java | 37 ++++---- .../hbase/mapreduce/TestHFileOutputFormat2.java | 14 +-- .../hbase/mapreduce/TestHRegionPartitioner.java | 35 +++++--- .../hadoop/hbase/mapreduce/TestHashTable.java | 13 ++- .../hbase/mapreduce/TestImportExport.java | 11 ++- .../TestImportTSVWithOperationAttributes.java | 22 ++--- .../hbase/mapreduce/TestImportTSVWithTTLs.java | 17 ++-- .../TestImportTSVWithVisibilityLabels.java | 7 +- .../hadoop/hbase/mapreduce/TestImportTsv.java | 8 +- .../hbase/mapreduce/TestImportTsvParser.java | 12 ++- .../hadoop/hbase/mapreduce/TestJarFinder.java | 18 ++-- .../mapreduce/TestMultiTableInputFormat.java | 11 ++- .../TestMultiTableInputFormatBase.java | 38 ++++---- .../TestMultiTableSnapshotInputFormat.java | 15 ++-- .../TestMultiTableSnapshotInputFormatImpl.java | 41 +++++---- .../mapreduce/TestMultithreadedTableMapper.java | 10 ++- .../mapreduce/TestRegionSizeCalculator.java | 6 ++ .../hadoop/hbase/mapreduce/TestRowCounter.java | 14 +-- .../TestSimpleTotalOrderPartitioner.java | 11 ++- .../hadoop/hbase/mapreduce/TestSyncTable.java | 13 +-- .../hbase/mapreduce/TestTableInputFormat.java | 8 +- .../mapreduce/TestTableInputFormatBase.java | 9 +- .../mapreduce/TestTableInputFormatScan1.java | 8 +- .../mapreduce/TestTableInputFormatScan2.java | 8 +- .../hbase/mapreduce/TestTableMapReduce.java | 9 +- .../hbase/mapreduce/TestTableMapReduceBase.java | 6 -- .../hbase/mapreduce/TestTableMapReduceUtil.java | 30 ++++--- .../mapreduce/TestTableSnapshotInputFormat.java | 30 +++---- .../hadoop/hbase/mapreduce/TestTableSplit.java | 16 ++-- .../hbase/mapreduce/TestTimeRangeMapRed.java | 23 +++-- .../hadoop/hbase/mapreduce/TestWALPlayer.java | 14 ++- .../hbase/mapreduce/TestWALRecordReader.java | 7 ++ .../replication/TestVerifyReplication.java | 6 ++ .../hbase/snapshot/TestExportSnapshot.java | 14 +-- .../snapshot/TestExportSnapshotHelpers.java | 12 ++- .../snapshot/TestExportSnapshotNoCluster.java | 13 +-- .../hbase/snapshot/TestMobExportSnapshot.java | 8 +- .../snapshot/TestMobSecureExportSnapshot.java | 14 +-- .../snapshot/TestSecureExportSnapshot.java | 16 ++-- hbase-metrics-api/pom.xml | 6 ++ .../metrics/TestMetricRegistriesLoader.java | 6 ++ hbase-metrics/pom.xml | 6 ++ .../hbase/metrics/impl/TestCounterImpl.java | 6 ++ .../hbase/metrics/impl/TestDropwizardMeter.java | 7 +- .../metrics/impl/TestFastLongHistogram.java | 7 +- .../hadoop/hbase/metrics/impl/TestGauge.java | 7 +- .../hbase/metrics/impl/TestHistogramImpl.java | 12 +-- .../metrics/impl/TestMetricRegistryImpl.java | 13 +-- .../hbase/metrics/impl/TestRefCountingMap.java | 10 ++- .../hbase/metrics/impl/TestTimerImpl.java | 7 +- .../hbase/procedure2/TestChildProcedures.java | 17 ++-- .../hbase/procedure2/TestProcedureEvents.java | 20 +++-- .../procedure2/TestProcedureExecution.java | 18 ++-- .../hbase/procedure2/TestProcedureExecutor.java | 16 ++-- .../procedure2/TestProcedureInMemoryChore.java | 9 +- .../hbase/procedure2/TestProcedureMetrics.java | 19 ++-- .../hbase/procedure2/TestProcedureNonce.java | 24 ++--- .../hbase/procedure2/TestProcedureRecovery.java | 24 +++-- .../procedure2/TestProcedureReplayOrder.java | 19 ++-- .../TestProcedureSchedulerConcurrency.java | 22 +++-- .../procedure2/TestProcedureSuspended.java | 9 +- .../hbase/procedure2/TestProcedureToString.java | 12 ++- .../hbase/procedure2/TestProcedureUtil.java | 16 ++-- .../procedure2/TestStateMachineProcedure.java | 18 ++-- .../hbase/procedure2/TestYieldProcedures.java | 20 +++-- .../store/TestProcedureStoreTracker.java | 24 ++--- .../store/wal/TestStressWALProcedureStore.java | 22 +++-- .../store/wal/TestWALProcedureStore.java | 25 +++--- .../hbase/procedure2/util/TestDelayedUtil.java | 14 ++- .../replication/TestReplicationStateZKImpl.java | 6 ++ .../TestZKReplicationPeerStorage.java | 7 +- .../TestZKReplicationQueueStorage.java | 8 +- .../apache/hadoop/hbase/rest/TestDeleteRow.java | 10 ++- .../hbase/rest/TestGZIPResponseWrapper.java | 17 ++-- .../hbase/rest/TestGetAndPutResource.java | 16 ++-- .../hadoop/hbase/rest/TestGzipFilter.java | 15 ++-- .../hadoop/hbase/rest/TestMultiRowResource.java | 10 ++- .../rest/TestNamespacesInstanceResource.java | 28 +++--- .../hbase/rest/TestNamespacesResource.java | 17 ++-- .../hadoop/hbase/rest/TestResourceFilter.java | 8 +- .../hadoop/hbase/rest/TestScannerResource.java | 13 +-- .../hbase/rest/TestScannersWithFilters.java | 12 +-- .../hbase/rest/TestScannersWithLabels.java | 11 ++- .../hadoop/hbase/rest/TestSchemaResource.java | 14 +-- .../hadoop/hbase/rest/TestStatusResource.java | 12 ++- .../hadoop/hbase/rest/TestTableResource.java | 17 ++-- .../apache/hadoop/hbase/rest/TestTableScan.java | 10 ++- .../hadoop/hbase/rest/TestVersionResource.java | 21 +++-- .../rest/client/TestRemoteAdminRetries.java | 9 +- .../rest/client/TestRemoteHTableRetries.java | 13 ++- .../hbase/rest/client/TestRemoteTable.java | 44 +++++----- .../hbase/rest/client/TestXmlParsing.java | 25 ++++-- .../hadoop/hbase/rest/model/TestCellModel.java | 11 ++- .../hbase/rest/model/TestCellSetModel.java | 12 +-- .../hbase/rest/model/TestColumnSchemaModel.java | 10 ++- .../hadoop/hbase/rest/model/TestModelBase.java | 10 +-- .../rest/model/TestNamespacesInstanceModel.java | 11 ++- .../hbase/rest/model/TestNamespacesModel.java | 12 +-- .../hadoop/hbase/rest/model/TestRowModel.java | 12 +-- .../hbase/rest/model/TestScannerModel.java | 11 ++- .../model/TestStorageClusterStatusModel.java | 14 +-- .../model/TestStorageClusterVersionModel.java | 11 ++- .../hbase/rest/model/TestTableInfoModel.java | 13 +-- .../hbase/rest/model/TestTableListModel.java | 13 +-- .../hbase/rest/model/TestTableRegionModel.java | 14 +-- .../hbase/rest/model/TestTableSchemaModel.java | 13 +-- .../hbase/rest/model/TestVersionModel.java | 14 ++- .../balancer/TestRSGroupBasedLoadBalancer.java | 8 +- .../hadoop/hbase/rsgroup/TestRSGroups.java | 9 +- .../hbase/rsgroup/TestRSGroupsOfflineMode.java | 7 ++ .../hbase/rsgroup/TestRSGroupsWithACL.java | 23 +++-- .../TestAcidGuaranteesWithAdaptivePolicy.java | 6 +- .../TestAcidGuaranteesWithBasicPolicy.java | 6 +- .../TestAcidGuaranteesWithEagerPolicy.java | 7 +- ...TestAcidGuaranteesWithNoInMemCompaction.java | 14 ++- .../hadoop/hbase/TestCheckTestClasses.java | 9 +- .../hadoop/hbase/TestClientClusterMetrics.java | 6 ++ .../hadoop/hbase/TestClientClusterStatus.java | 6 ++ .../hadoop/hbase/TestClusterBootOrder.java | 6 +- .../TestFSTableDescriptorForceCreation.java | 8 +- .../hadoop/hbase/TestFullLogReconstruction.java | 7 +- .../hadoop/hbase/TestGlobalMemStoreSize.java | 11 ++- .../hbase/TestHBaseOnOtherDfsCluster.java | 15 ++-- .../hadoop/hbase/TestHBaseTestingUtility.java | 9 +- .../TestHColumnDescriptorDefaultVersions.java | 8 +- .../hbase/TestHDFSBlocksDistribution.java | 16 ++-- .../hadoop/hbase/TestHRegionLocation.java | 7 +- .../org/apache/hadoop/hbase/TestIOFencing.java | 9 +- .../hbase/TestIPv6NIOServerSocketChannel.java | 13 ++- .../apache/hadoop/hbase/TestInfoServers.java | 8 +- .../hadoop/hbase/TestJMXConnectorServer.java | 11 ++- .../apache/hadoop/hbase/TestJMXListener.java | 14 +-- .../hadoop/hbase/TestLocalHBaseCluster.java | 8 +- .../hadoop/hbase/TestMetaTableAccessor.java | 9 +- .../hbase/TestMetaTableAccessorNoCluster.java | 15 +++- .../hadoop/hbase/TestMetaTableLocator.java | 22 +++-- .../hadoop/hbase/TestMovedRegionsCleaner.java | 17 ++-- .../apache/hadoop/hbase/TestMultiVersions.java | 14 +-- .../org/apache/hadoop/hbase/TestNamespace.java | 14 +-- .../hadoop/hbase/TestNodeHealthCheckChore.java | 6 +- .../hbase/TestPartialResultsFromClientSide.java | 7 +- .../org/apache/hadoop/hbase/TestRegionLoad.java | 12 ++- .../apache/hadoop/hbase/TestRegionMetrics.java | 7 +- .../hadoop/hbase/TestRegionRebalancing.java | 9 +- .../apache/hadoop/hbase/TestSerialization.java | 14 +-- .../org/apache/hadoop/hbase/TestServerLoad.java | 9 +- .../apache/hadoop/hbase/TestServerMetrics.java | 9 +- .../org/apache/hadoop/hbase/TestServerName.java | 7 +- ...TestServerSideScanMetricsFromClientSide.java | 30 +++++-- .../java/org/apache/hadoop/hbase/TestSize.java | 8 +- .../hbase/TestStochasticBalancerJmxMetrics.java | 7 +- .../apache/hadoop/hbase/TestTagRewriteCell.java | 20 +++-- .../org/apache/hadoop/hbase/TestZooKeeper.java | 7 +- .../hadoop/hbase/backup/TestHFileArchiving.java | 7 +- .../TestZooKeeperTableArchiveClient.java | 7 +- .../apache/hadoop/hbase/client/TestAdmin1.java | 10 ++- .../apache/hadoop/hbase/client/TestAdmin2.java | 9 +- .../client/TestAllowPartialScanResultCache.java | 7 +- .../hbase/client/TestAlwaysSetScannerId.java | 19 ++-- .../hbase/client/TestAppendFromClientSide.java | 17 ++-- .../hbase/client/TestAsyncAdminBuilder.java | 9 +- .../hbase/client/TestAsyncBufferMutator.java | 7 +- .../hbase/client/TestAsyncClusterAdminApi.java | 6 ++ .../hbase/client/TestAsyncClusterAdminApi2.java | 7 +- .../client/TestAsyncDecommissionAdminApi.java | 6 ++ .../client/TestAsyncMetaRegionLocator.java | 7 +- .../client/TestAsyncNamespaceAdminApi.java | 7 +- .../client/TestAsyncNonMetaRegionLocator.java | 9 +- ...syncNonMetaRegionLocatorConcurrenyLimit.java | 7 +- .../client/TestAsyncProcedureAdminApi.java | 8 +- .../hbase/client/TestAsyncQuotaAdminApi.java | 8 +- .../hbase/client/TestAsyncRegionAdminApi.java | 7 +- .../client/TestAsyncRegionLocatorTimeout.java | 7 +- .../client/TestAsyncReplicationAdminApi.java | 7 +- ...estAsyncReplicationAdminApiWithClusters.java | 7 +- .../client/TestAsyncResultScannerCursor.java | 7 +- ...TestAsyncSingleRequestRpcRetryingCaller.java | 7 +- .../hbase/client/TestAsyncSnapshotAdminApi.java | 7 +- .../hadoop/hbase/client/TestAsyncTable.java | 7 +- .../hbase/client/TestAsyncTableAdminApi.java | 7 +- .../hbase/client/TestAsyncTableBatch.java | 7 +- .../client/TestAsyncTableGetMultiThreaded.java | 8 +- ...ableGetMultiThreadedWithBasicCompaction.java | 6 ++ ...ableGetMultiThreadedWithEagerCompaction.java | 6 ++ .../hbase/client/TestAsyncTableNoncedRetry.java | 8 +- .../hadoop/hbase/client/TestAsyncTableScan.java | 7 +- .../hbase/client/TestAsyncTableScanAll.java | 7 +- .../hbase/client/TestAsyncTableScanMetrics.java | 7 +- .../client/TestAsyncTableScanRenewLease.java | 7 +- .../hbase/client/TestAsyncTableScanner.java | 7 +- ...stAsyncTableScannerCloseWhileSuspending.java | 7 +- .../hbase/client/TestAsyncToolAdminApi.java | 6 ++ ...estAvoidCellReferencesIntoShippedBlocks.java | 8 +- .../hbase/client/TestBatchScanResultCache.java | 7 +- .../client/TestBlockEvictionFromClient.java | 8 +- .../hadoop/hbase/client/TestCIBadHostname.java | 10 ++- .../client/TestCIDeleteOperationTimeout.java | 6 ++ .../hbase/client/TestCIDeleteRpcTimeout.java | 6 ++ .../hbase/client/TestCIGetOperationTimeout.java | 6 ++ .../hbase/client/TestCIGetRpcTimeout.java | 6 ++ .../hbase/client/TestCIIncrementRpcTimeout.java | 6 ++ .../hbase/client/TestCIPutOperationTimeout.java | 6 ++ .../hbase/client/TestCIPutRpcTimeout.java | 6 ++ .../apache/hadoop/hbase/client/TestCISleep.java | 6 ++ .../hadoop/hbase/client/TestCheckAndMutate.java | 17 ++-- .../client/TestClientOperationInterrupt.java | 24 ++--- .../hadoop/hbase/client/TestClientPushback.java | 19 ++-- .../client/TestClientScannerRPCTimeout.java | 19 ++-- .../hadoop/hbase/client/TestClientTimeouts.java | 12 ++- .../client/TestCloneSnapshotFromClient.java | 8 +- ...oneSnapshotFromClientWithRegionReplicas.java | 7 ++ .../TestCompleteResultScanResultCache.java | 7 +- .../client/TestConnectionImplementation.java | 14 +-- .../hbase/client/TestConnectionUtils.java | 17 ++-- .../hbase/client/TestDropTimeoutRequest.java | 26 +++--- .../hadoop/hbase/client/TestEnableTable.java | 22 +++-- .../hadoop/hbase/client/TestFastFail.java | 12 ++- .../hbase/client/TestFlushFromClient.java | 9 +- .../hadoop/hbase/client/TestFromClientSide.java | 8 +- .../hbase/client/TestFromClientSide3.java | 10 ++- .../hbase/client/TestFromClientSideNoCodec.java | 8 +- .../client/TestFromClientSideScanExcpetion.java | 7 +- ...mClientSideScanExcpetionWithCoprocessor.java | 7 ++ .../TestFromClientSideWithCoprocessor.java | 13 ++- .../hbase/client/TestGetProcedureResult.java | 6 ++ .../hbase/client/TestHBaseAdminNoCluster.java | 39 ++++---- .../hbase/client/TestHTableMultiplexer.java | 14 +-- .../client/TestHTableMultiplexerFlushCache.java | 19 ++-- .../client/TestIllegalTableDescriptor.java | 9 +- ...tIncrementFromClientSideWithCoprocessor.java | 9 +- .../client/TestIncrementsFromClientSide.java | 9 +- .../hbase/client/TestIntraRowPagination.java | 32 ++++--- .../hadoop/hbase/client/TestLeaseRenewal.java | 9 +- .../hbase/client/TestLimitedScanWithFilter.java | 7 +- .../hadoop/hbase/client/TestMetaCache.java | 35 +++++--- .../hbase/client/TestMetaWithReplicas.java | 15 ++-- .../client/TestMobCloneSnapshotFromClient.java | 7 +- .../TestMobRestoreSnapshotFromClient.java | 7 +- .../TestMobSnapshotCloneIndependence.java | 12 +-- .../hbase/client/TestMobSnapshotFromClient.java | 8 +- .../hadoop/hbase/client/TestMultiParallel.java | 10 ++- .../hbase/client/TestMultiRespectsLimits.java | 11 ++- .../hbase/client/TestMultipleTimestamps.java | 9 +- .../hbase/client/TestMvccConsistentScanner.java | 7 +- .../client/TestPutDeleteEtcCellIteration.java | 11 ++- .../hadoop/hbase/client/TestPutWithDelete.java | 12 ++- .../hbase/client/TestRawAsyncScanCursor.java | 7 +- .../TestRawAsyncTableLimitedScanWithFilter.java | 7 +- .../client/TestRawAsyncTablePartialScan.java | 7 +- .../hbase/client/TestRawAsyncTableScan.java | 7 +- .../hbase/client/TestReplicaWithCluster.java | 14 +-- .../hadoop/hbase/client/TestReplicasClient.java | 20 +++-- .../client/TestRestoreSnapshotFromClient.java | 13 ++- ...oreSnapshotFromClientWithRegionReplicas.java | 7 ++ .../apache/hadoop/hbase/client/TestResult.java | 12 +-- .../hbase/client/TestResultFromCoprocessor.java | 13 ++- .../hbase/client/TestResultScannerCursor.java | 7 +- .../hbase/client/TestResultSizeEstimation.java | 14 ++- .../client/TestScanWithoutFetchingData.java | 21 +++-- .../hadoop/hbase/client/TestScannerTimeout.java | 7 +- .../client/TestScannersFromClientSide.java | 60 +++++++------ .../client/TestScannersFromClientSide2.java | 7 +- .../hbase/client/TestServerBusyException.java | 19 ++-- .../hbase/client/TestServerLoadDurability.java | 7 ++ .../client/TestShortCircuitConnection.java | 13 ++- .../hadoop/hbase/client/TestSizeFailures.java | 10 ++- .../hbase/client/TestSmallReversedScanner.java | 10 ++- .../client/TestSnapshotCloneIndependence.java | 12 ++- .../hbase/client/TestSnapshotFromClient.java | 16 +++- ...estSnapshotFromClientWithRegionReplicas.java | 6 ++ .../hbase/client/TestSnapshotMetadata.java | 9 +- .../hbase/client/TestSnapshotWithAcl.java | 12 ++- .../hbase/client/TestSplitOrMergeStatus.java | 9 +- .../hbase/client/TestTableFavoredNodes.java | 9 +- .../hbase/client/TestTableSnapshotScanner.java | 8 +- .../hbase/client/TestTimestampsFilter.java | 11 ++- .../hbase/client/TestUpdateConfiguration.java | 11 ++- .../hbase/client/TestZKAsyncRegistry.java | 7 ++ .../hbase/client/locking/TestEntityLocks.java | 28 +++--- .../replication/TestReplicationAdmin.java | 6 ++ .../TestReplicationAdminWithClusters.java | 30 +++++-- ...licationAdminWithTwoDifferentZKClusters.java | 30 +++++-- .../hbase/codec/TestCellMessageCodec.java | 9 +- .../hbase/conf/TestConfigurationManager.java | 8 +- .../hadoop/hbase/constraint/TestConstraint.java | 12 ++- .../hbase/constraint/TestConstraints.java | 18 ++-- .../hbase/coprocessor/TestAppendTimeRange.java | 8 +- .../TestCoprocessorConfiguration.java | 23 +++-- .../hbase/coprocessor/TestCoprocessorHost.java | 16 +++- .../coprocessor/TestCoprocessorInterface.java | 12 ++- .../coprocessor/TestCoprocessorMetrics.java | 28 +++--- .../TestCoprocessorShortCircuitRPC.java | 22 ++--- .../hbase/coprocessor/TestCoprocessorStop.java | 24 ++--- .../coprocessor/TestCoreMasterCoprocessor.java | 26 +++--- .../coprocessor/TestCoreRegionCoprocessor.java | 27 +++--- .../TestCoreRegionServerCoprocessor.java | 27 +++--- .../coprocessor/TestIncrementTimeRange.java | 9 +- ...TestMasterCoprocessorExceptionWithAbort.java | 23 ++--- ...estMasterCoprocessorExceptionWithRemove.java | 21 +++-- .../hbase/coprocessor/TestMasterObserver.java | 13 ++- ...NegativeMemStoreSizeWithSlowCoprocessor.java | 33 ++++--- .../coprocessor/TestOpenTableInCoprocessor.java | 32 ++++--- .../TestPassCustomCellViaRegionObserver.java | 15 ++-- .../coprocessor/TestReadOnlyConfiguration.java | 41 +++++---- .../coprocessor/TestRegionObserverBypass.java | 15 ++-- ...erverForAddingMutationsFromCoprocessors.java | 15 ++-- .../TestRegionObserverInterface.java | 17 ++-- ...TestRegionObserverPreFlushAndPreCompact.java | 24 ++--- .../TestRegionObserverScannerOpenHook.java | 10 ++- .../coprocessor/TestRegionObserverStacking.java | 17 ++-- ...gionServerCoprocessorExceptionWithAbort.java | 16 ++-- ...ionServerCoprocessorExceptionWithRemove.java | 16 ++-- .../hbase/coprocessor/TestWALObserver.java | 9 +- .../TestForeignExceptionDispatcher.java | 7 ++ .../TestForeignExceptionSerialization.java | 10 ++- .../TestTimeoutExceptionInjector.java | 6 ++ .../hbase/executor/TestExecutorService.java | 25 ++++-- .../TestFavoredNodeAssignmentHelper.java | 10 ++- .../TestStartcodeAgnosticServerName.java | 6 ++ .../hbase/filter/TestBigDecimalComparator.java | 23 ++--- .../hadoop/hbase/filter/TestBitComparator.java | 34 +++---- .../filter/TestColumnPaginationFilter.java | 13 ++- .../hbase/filter/TestColumnPrefixFilter.java | 7 +- .../hbase/filter/TestColumnRangeFilter.java | 14 +-- .../filter/TestComparatorSerialization.java | 12 ++- .../hbase/filter/TestDependentColumnFilter.java | 12 ++- .../apache/hadoop/hbase/filter/TestFilter.java | 16 ++-- .../hbase/filter/TestFilterFromRegionSide.java | 15 ++-- .../hadoop/hbase/filter/TestFilterList.java | 10 ++- .../hbase/filter/TestFilterListOnMini.java | 7 +- .../TestFilterListOrOperatorWithBlkCnt.java | 9 +- .../hbase/filter/TestFilterSerialization.java | 16 ++-- .../hbase/filter/TestFilterWithScanLimits.java | 12 ++- .../hadoop/hbase/filter/TestFilterWrapper.java | 19 ++-- ...stFirstKeyValueMatchingQualifiersFilter.java | 11 ++- .../TestFuzzyRowAndColumnRangeFilter.java | 27 +++--- .../hadoop/hbase/filter/TestFuzzyRowFilter.java | 9 +- .../filter/TestFuzzyRowFilterEndToEnd.java | 55 +++++++----- .../hbase/filter/TestInclusiveStopFilter.java | 14 ++- .../filter/TestInvocationRecordFilter.java | 9 +- .../hbase/filter/TestMultiRowRangeFilter.java | 9 +- .../filter/TestMultipleColumnPrefixFilter.java | 36 ++++---- .../hadoop/hbase/filter/TestNullComparator.java | 26 +++--- .../hadoop/hbase/filter/TestPageFilter.java | 9 +- .../hadoop/hbase/filter/TestParseFilter.java | 12 ++- .../hadoop/hbase/filter/TestPrefixFilter.java | 15 ++-- .../hbase/filter/TestRandomRowFilter.java | 17 ++-- .../hbase/filter/TestRegexComparator.java | 8 +- .../hadoop/hbase/filter/TestScanRowPrefix.java | 22 +++-- .../TestSingleColumnValueExcludeFilter.java | 20 +++-- .../filter/TestSingleColumnValueFilter.java | 9 +- .../hadoop/hbase/fs/TestBlockReorder.java | 9 +- .../hbase/io/TestByteBufferOutputStream.java | 8 +- .../apache/hadoop/hbase/io/TestFileLink.java | 8 +- .../apache/hadoop/hbase/io/TestHFileLink.java | 21 +++-- .../hbase/io/TestHalfStoreFileReader.java | 12 ++- .../apache/hadoop/hbase/io/TestHeapSize.java | 12 ++- .../hbase/io/TestImmutableBytesWritable.java | 17 ++-- .../apache/hadoop/hbase/io/TestMetricsIO.java | 7 +- .../TestFanOutOneBlockAsyncDFSOutput.java | 6 ++ .../hbase/io/asyncfs/TestLocalAsyncOutput.java | 7 +- .../TestSaslFanOutOneBlockAsyncDFSOutput.java | 7 +- .../io/asyncfs/TestSendBufSizePredictor.java | 6 ++ .../encoding/TestBufferedDataBlockEncoder.java | 36 ++++---- .../hbase/io/encoding/TestChangingEncoding.java | 49 ++++++----- .../io/encoding/TestDataBlockEncoders.java | 49 +++++------ .../io/encoding/TestDataBlockEncoding.java | 31 ++++--- .../hbase/io/encoding/TestEncodedSeekers.java | 36 ++++---- .../encoding/TestLoadAndSwitchEncodeOnDisk.java | 38 ++++---- .../encoding/TestSeekBeforeWithReverseScan.java | 12 ++- .../encoding/TestSeekToBlockWithEncoders.java | 35 +++++--- .../hbase/io/hfile/TestBlockCacheReporting.java | 17 ++-- .../hadoop/hbase/io/hfile/TestCacheConfig.java | 13 ++- .../hadoop/hbase/io/hfile/TestCacheOnWrite.java | 14 +-- .../hbase/io/hfile/TestCachedBlockQueue.java | 12 ++- .../hadoop/hbase/io/hfile/TestChecksum.java | 28 +++--- .../hbase/io/hfile/TestCombinedBlockCache.java | 25 ++++-- .../hbase/io/hfile/TestFixedFileTrailer.java | 10 ++- .../io/hfile/TestForceCacheImportantBlocks.java | 37 ++++---- .../apache/hadoop/hbase/io/hfile/TestHFile.java | 10 ++- .../hadoop/hbase/io/hfile/TestHFileBlock.java | 12 ++- .../hbase/io/hfile/TestHFileBlockIndex.java | 13 +-- .../io/hfile/TestHFileBlockPositionalRead.java | 9 +- .../io/hfile/TestHFileDataBlockEncoder.java | 37 ++++---- .../hbase/io/hfile/TestHFileEncryption.java | 10 ++- .../TestHFileInlineToRootChunkConversion.java | 39 ++++---- .../hadoop/hbase/io/hfile/TestHFileSeek.java | 49 ++++++----- .../hbase/io/hfile/TestHFileWriterV3.java | 11 ++- .../hfile/TestLazyDataBlockDecompression.java | 8 +- .../hbase/io/hfile/TestLruBlockCache.java | 16 ++-- .../hbase/io/hfile/TestLruCachedBlock.java | 12 ++- .../hadoop/hbase/io/hfile/TestPrefetch.java | 14 +-- .../hadoop/hbase/io/hfile/TestReseekTo.java | 10 ++- .../io/hfile/TestScannerFromBucketCache.java | 11 ++- .../TestScannerSelectionUsingKeyRange.java | 35 +++++--- .../io/hfile/TestScannerSelectionUsingTTL.java | 32 ++++--- .../hfile/TestSeekBeforeWithInlineBlocks.java | 71 ++++++++------- .../hadoop/hbase/io/hfile/TestSeekTo.java | 8 +- .../hbase/io/hfile/bucket/TestBucketCache.java | 31 ++++--- .../io/hfile/bucket/TestBucketWriterThread.java | 59 +++++++------ .../io/hfile/bucket/TestByteBufferIOEngine.java | 32 ++++--- .../hbase/io/hfile/bucket/TestFileIOEngine.java | 32 ++++--- .../io/hfile/bucket/TestFileMmapEngine.java | 33 ++++--- .../hadoop/hbase/ipc/TestBlockingIPC.java | 8 +- .../hadoop/hbase/ipc/TestBufferChain.java | 12 ++- .../apache/hadoop/hbase/ipc/TestCallRunner.java | 7 ++ .../hadoop/hbase/ipc/TestFifoRpcScheduler.java | 36 ++++---- .../hadoop/hbase/ipc/TestHBaseClient.java | 10 ++- .../apache/hadoop/hbase/ipc/TestNettyIPC.java | 8 +- .../hadoop/hbase/ipc/TestNettyRpcServer.java | 8 +- .../hadoop/hbase/ipc/TestProtoBufRpc.java | 17 ++-- .../hadoop/hbase/ipc/TestRpcClientLeaks.java | 17 ++-- .../hbase/ipc/TestRpcHandlerException.java | 14 ++- .../apache/hadoop/hbase/ipc/TestRpcMetrics.java | 20 +++-- .../apache/hadoop/hbase/ipc/TestRpcServer.java | 7 +- .../ipc/TestRpcServerSlowConnectionSetup.java | 24 +++-- .../hbase/ipc/TestSimpleRpcScheduler.java | 37 ++++---- .../hbase/master/TestActiveMasterManager.java | 11 ++- .../hbase/master/TestAssignmentListener.java | 9 +- .../master/TestAssignmentManagerMetrics.java | 13 ++- .../hadoop/hbase/master/TestCatalogJanitor.java | 13 +-- .../TestCatalogJanitorInMemoryStates.java | 13 +-- .../hbase/master/TestClockSkewDetection.java | 12 ++- .../master/TestClusterStatusPublisher.java | 15 ++-- .../hadoop/hbase/master/TestDLSAsyncFSWAL.java | 6 ++ .../hadoop/hbase/master/TestDLSFSHLog.java | 6 ++ .../hadoop/hbase/master/TestDeadServer.java | 20 +++-- .../hadoop/hbase/master/TestGetInfoPort.java | 6 ++ .../master/TestGetLastFlushedSequenceId.java | 10 ++- .../hbase/master/TestHMasterCommandLine.java | 10 ++- .../hbase/master/TestHMasterRPCException.java | 19 ++-- .../apache/hadoop/hbase/master/TestMaster.java | 10 ++- .../master/TestMasterBalanceThrottling.java | 9 +- .../master/TestMasterCoprocessorServices.java | 29 +++--- .../hadoop/hbase/master/TestMasterFailover.java | 16 ++-- .../TestMasterFailoverBalancerPersistence.java | 7 +- .../hbase/master/TestMasterFileSystem.java | 7 ++ .../master/TestMasterFileSystemWithWALDir.java | 6 ++ .../hadoop/hbase/master/TestMasterMetrics.java | 14 ++- .../hbase/master/TestMasterMetricsWrapper.java | 8 +- .../hbase/master/TestMasterNoCluster.java | 22 ++--- .../TestMasterOperationsForRegionReplicas.java | 8 +- .../hbase/master/TestMasterQosFunction.java | 15 +++- .../TestMasterRestartAfterDisablingTable.java | 8 +- .../hadoop/hbase/master/TestMasterShutdown.java | 9 +- .../hbase/master/TestMasterStatusServlet.java | 8 +- .../hbase/master/TestMasterTransitions.java | 9 +- .../hbase/master/TestMetaShutdownHandler.java | 10 ++- .../hbase/master/TestRegionPlacement.java | 8 +- .../hbase/master/TestRegionPlacement2.java | 8 +- .../hadoop/hbase/master/TestRegionPlan.java | 9 +- .../hadoop/hbase/master/TestRegionState.java | 12 ++- .../hadoop/hbase/master/TestRestartCluster.java | 9 +- .../hadoop/hbase/master/TestRollingRestart.java | 12 ++- .../hbase/master/TestShutdownBackupMaster.java | 13 +-- .../hbase/master/TestSplitLogManager.java | 9 +- .../hbase/master/TestTableStateManager.java | 16 ++-- .../hadoop/hbase/master/TestWarmupRegion.java | 9 +- .../assignment/TestAssignmentManager.java | 17 ++-- .../assignment/TestAssignmentOnRSCrash.java | 9 +- .../TestMergeTableRegionsProcedure.java | 13 +-- .../master/assignment/TestRegionStates.java | 9 +- .../assignment/TestRogueRSAssignment.java | 33 ++++--- .../TestSplitTableRegionProcedure.java | 13 +-- .../hbase/master/balancer/BalancerTestBase.java | 6 -- .../master/balancer/TestBaseLoadBalancer.java | 8 +- .../balancer/TestDefaultLoadBalancer.java | 8 +- .../balancer/TestFavoredNodeTableImport.java | 13 ++- .../TestFavoredStochasticBalancerPickers.java | 8 +- .../TestFavoredStochasticLoadBalancer.java | 6 ++ .../balancer/TestRegionLocationFinder.java | 7 ++ .../balancer/TestRegionsOnMasterOptions.java | 22 ++--- .../master/balancer/TestServerAndLoad.java | 12 ++- .../balancer/TestStochasticLoadBalancer.java | 7 ++ .../balancer/TestStochasticLoadBalancer2.java | 19 ++-- ...estStochasticLoadBalancerBalanceCluster.java | 6 ++ .../TestStochasticLoadBalancerLargeCluster.java | 6 ++ .../TestStochasticLoadBalancerMidCluster.java | 6 ++ ...TestStochasticLoadBalancerRegionReplica.java | 6 ++ ...asticLoadBalancerRegionReplicaSameHosts.java | 6 ++ ...asticLoadBalancerRegionReplicaWithRacks.java | 6 ++ .../TestStochasticLoadBalancerSmallCluster.java | 6 ++ .../hbase/master/cleaner/TestCleanerChore.java | 7 +- .../hbase/master/cleaner/TestHFileCleaner.java | 10 ++- .../master/cleaner/TestHFileLinkCleaner.java | 13 +-- .../hbase/master/cleaner/TestLogsCleaner.java | 6 ++ .../cleaner/TestReplicationHFileCleaner.java | 7 ++ .../master/cleaner/TestSnapshotFromMaster.java | 27 +++--- .../hbase/master/locking/TestLockManager.java | 15 ++-- .../hbase/master/locking/TestLockProcedure.java | 21 ++--- .../normalizer/TestSimpleRegionNormalizer.java | 14 ++- .../TestSimpleRegionNormalizerOnCluster.java | 9 +- .../procedure/TestCloneSnapshotProcedure.java | 14 ++- .../procedure/TestCreateNamespaceProcedure.java | 9 +- .../procedure/TestCreateTableProcedure.java | 8 +- ...stDeleteColumnFamilyProcedureFromClient.java | 10 ++- .../procedure/TestDeleteNamespaceProcedure.java | 9 +- .../procedure/TestDeleteTableProcedure.java | 12 +-- .../procedure/TestDisableTableProcedure.java | 12 +-- .../procedure/TestEnableTableProcedure.java | 12 +-- .../TestFastFailOnProcedureNotRegistered.java | 8 +- .../TestMasterFailoverWithProcedures.java | 13 ++- .../procedure/TestMasterProcedureEvents.java | 8 +- .../procedure/TestMasterProcedureScheduler.java | 14 ++- ...TestMasterProcedureSchedulerConcurrency.java | 18 ++-- .../procedure/TestMasterProcedureWalLease.java | 14 ++- .../procedure/TestModifyNamespaceProcedure.java | 9 +- .../procedure/TestModifyTableProcedure.java | 12 +-- .../master/procedure/TestProcedureAdmin.java | 13 +-- .../procedure/TestRestoreSnapshotProcedure.java | 22 ++--- .../procedure/TestSafemodeBringsDownMaster.java | 9 +- .../procedure/TestServerCrashProcedure.java | 8 +- ...stTableDescriptorModificationFromClient.java | 9 +- .../procedure/TestTruncateTableProcedure.java | 12 +-- .../procedure/TestWALProcedureStoreOnHDFS.java | 20 +++-- .../master/snapshot/TestAssignProcedure.java | 42 +++++---- .../master/snapshot/TestSnapshotFileCache.java | 9 +- .../snapshot/TestSnapshotHFileCleaner.java | 13 ++- .../master/snapshot/TestSnapshotManager.java | 14 ++- .../hadoop/hbase/mob/TestCachedMobFile.java | 8 +- .../hbase/mob/TestDefaultMobStoreFlusher.java | 40 +++++---- .../hbase/mob/TestExpiredMobFileCleaner.java | 7 +- .../hbase/mob/TestMobDataBlockEncoding.java | 40 +++++---- .../apache/hadoop/hbase/mob/TestMobFile.java | 8 +- .../hadoop/hbase/mob/TestMobFileCache.java | 9 +- .../hadoop/hbase/mob/TestMobFileLink.java | 9 +- .../hadoop/hbase/mob/TestMobFileName.java | 8 +- .../hbase/mob/compactions/TestMobCompactor.java | 10 ++- .../TestPartitionedMobCompactionRequest.java | 9 +- .../TestPartitionedMobCompactor.java | 9 +- .../TestMemoryBoundedLogMessageBuffer.java | 12 ++- .../hbase/monitoring/TestTaskMonitor.java | 32 ++++--- .../hbase/namespace/TestNamespaceAuditor.java | 28 +++--- .../hbase/procedure/TestFailedProcCleanup.java | 36 +++++--- .../hadoop/hbase/procedure/TestProcedure.java | 11 ++- .../procedure/TestProcedureCoordinator.java | 11 ++- .../hbase/procedure/TestProcedureDescriber.java | 18 ++-- .../hbase/procedure/TestProcedureManager.java | 9 +- .../hbase/procedure/TestProcedureMember.java | 12 ++- .../hadoop/hbase/procedure/TestZKProcedure.java | 12 ++- .../procedure/TestZKProcedureControllers.java | 11 ++- .../hadoop/hbase/protobuf/TestProtobufUtil.java | 12 ++- .../hbase/protobuf/TestReplicationProtobuf.java | 9 +- .../quotas/TestActivePolicyEnforcement.java | 28 +++--- .../quotas/TestFileSystemUtilizationChore.java | 24 +++-- .../quotas/TestGlobalQuotaSettingsImpl.java | 29 +++--- .../hbase/quotas/TestMasterQuotaManager.java | 23 +++-- .../quotas/TestMasterSpaceQuotaObserver.java | 25 ++++-- .../TestMasterSpaceQuotaObserverWithMocks.java | 24 +++-- .../TestNamespaceQuotaViolationStore.java | 25 ++++-- .../hadoop/hbase/quotas/TestQuotaAdmin.java | 27 +++--- .../hbase/quotas/TestQuotaObserverChore.java | 25 ++++-- .../TestQuotaObserverChoreRegionReports.java | 25 ++++-- .../TestQuotaObserverChoreWithMiniCluster.java | 29 +++--- .../hadoop/hbase/quotas/TestQuotaState.java | 27 +++--- .../hbase/quotas/TestQuotaStatusRPCs.java | 25 ++++-- .../hadoop/hbase/quotas/TestQuotaTableUtil.java | 20 +++-- .../hadoop/hbase/quotas/TestQuotaThrottle.java | 16 ++-- .../hadoop/hbase/quotas/TestRateLimiter.java | 8 +- .../TestRegionServerSpaceQuotaManager.java | 26 +++--- .../hadoop/hbase/quotas/TestRegionSizeUse.java | 25 ++++-- .../quotas/TestSnapshotQuotaObserverChore.java | 24 +++-- ...SpaceQuotaViolationPolicyRefresherChore.java | 24 +++-- .../hadoop/hbase/quotas/TestSpaceQuotas.java | 25 ++++-- .../quotas/TestSpaceQuotasWithSnapshots.java | 31 ++++--- .../quotas/TestSuperUserQuotaPermissions.java | 25 ++++-- .../quotas/TestTableQuotaViolationStore.java | 25 ++++-- .../TestTableSpaceQuotaViolationNotifier.java | 27 +++--- .../hbase/quotas/TestTablesWithQuotas.java | 25 ++++-- ...kLoadCheckingViolationPolicyEnforcement.java | 24 +++-- ...tDisableTableViolationPolicyEnforcement.java | 23 +++-- ...TestNoInsertsViolationPolicyEnforcement.java | 23 +++-- ...esCompactionsViolationPolicyEnforcement.java | 23 +++-- .../TestNoWritesViolationPolicyEnforcement.java | 23 +++-- .../hbase/regionserver/TestAtomicOperation.java | 8 +- .../hbase/regionserver/TestBlocksRead.java | 26 +++--- .../hbase/regionserver/TestBlocksScanned.java | 11 ++- .../hadoop/hbase/regionserver/TestBulkLoad.java | 21 +++-- .../regionserver/TestCacheOnWriteInSchema.java | 10 ++- .../hbase/regionserver/TestCellFlatSet.java | 9 +- .../hbase/regionserver/TestCellSkipListSet.java | 13 ++- .../regionserver/TestClearRegionBlockCache.java | 17 ++-- .../hbase/regionserver/TestClusterId.java | 35 ++++---- .../hbase/regionserver/TestColumnSeeking.java | 14 +-- .../regionserver/TestCompactSplitThread.java | 13 ++- .../regionserver/TestCompactingMemStore.java | 18 ++-- .../TestCompactingToCellFlatMapMemStore.java | 21 +++-- .../hbase/regionserver/TestCompaction.java | 10 ++- .../TestCompactionArchiveConcurrentClose.java | 7 ++ .../TestCompactionArchiveIOException.java | 7 ++ .../TestCompactionFileNotFound.java | 9 +- .../TestCompactionInDeadRegionServer.java | 8 +- .../TestCompactionLifeCycleTracker.java | 7 +- .../hbase/regionserver/TestCompactionState.java | 13 ++- .../TestCompactionWithCoprocessor.java | 11 ++- .../regionserver/TestCompoundBloomFilter.java | 11 ++- .../TestDateTieredCompactionPolicy.java | 7 +- .../TestDateTieredCompactionPolicyOverflow.java | 7 +- .../TestDefaultCompactSelection.java | 7 +- .../hbase/regionserver/TestDefaultMemStore.java | 14 +-- .../regionserver/TestDefaultStoreEngine.java | 11 ++- .../hbase/regionserver/TestDeleteMobTable.java | 7 +- .../regionserver/TestEncryptionKeyRotation.java | 11 ++- .../TestEncryptionRandomKeying.java | 10 ++- .../TestEndToEndSplitTransaction.java | 9 +- .../hbase/regionserver/TestFSErrorsExposed.java | 11 ++- .../regionserver/TestFailedAppendAndSync.java | 10 ++- .../regionserver/TestFlushLifeCycleTracker.java | 7 +- .../regionserver/TestFlushRegionEntry.java | 7 ++ .../regionserver/TestGetClosestAtOrBefore.java | 15 ++-- .../hbase/regionserver/TestHMobStore.java | 10 ++- .../hadoop/hbase/regionserver/TestHRegion.java | 14 +-- .../regionserver/TestHRegionFileSystem.java | 16 ++-- .../hbase/regionserver/TestHRegionInfo.java | 17 ++-- .../regionserver/TestHRegionOnCluster.java | 8 +- .../regionserver/TestHRegionReplayEvents.java | 6 ++ .../regionserver/TestHRegionServerBulkLoad.java | 12 ++- .../TestHRegionServerBulkLoadWithOldClient.java | 18 ++-- .../TestHRegionWithInMemoryFlush.java | 13 ++- .../hadoop/hbase/regionserver/TestHStore.java | 7 ++ .../hbase/regionserver/TestHStoreFile.java | 18 ++-- .../regionserver/TestHdfsSnapshotHRegion.java | 7 +- .../regionserver/TestHeapMemoryManager.java | 10 ++- .../hbase/regionserver/TestJoinedScanners.java | 17 ++-- .../hbase/regionserver/TestKeepDeletes.java | 12 ++- .../hbase/regionserver/TestKeyValueHeap.java | 12 ++- .../regionserver/TestKeyValueScanFixture.java | 12 +-- .../hbase/regionserver/TestMajorCompaction.java | 9 +- .../regionserver/TestMasterAddressTracker.java | 13 ++- .../regionserver/TestMemStoreChunkPool.java | 49 ++++++----- .../hbase/regionserver/TestMemStoreLAB.java | 23 ++--- .../TestMemstoreLABWithoutPool.java | 10 ++- .../TestMetricsHeapMemoryManager.java | 34 ++++--- .../hbase/regionserver/TestMetricsRegion.java | 15 ++-- .../regionserver/TestMetricsRegionServer.java | 13 ++- .../regionserver/TestMetricsTableAggregate.java | 6 ++ .../regionserver/TestMetricsTableLatencies.java | 6 ++ .../hbase/regionserver/TestMinVersions.java | 13 ++- .../TestMiniBatchOperationInProgress.java | 18 ++-- .../hbase/regionserver/TestMinorCompaction.java | 10 ++- .../regionserver/TestMobStoreCompaction.java | 9 +- .../hbase/regionserver/TestMobStoreScanner.java | 8 +- .../regionserver/TestMultiColumnScanner.java | 12 ++- .../regionserver/TestMultiLogThreshold.java | 28 +++--- .../TestMultiVersionConcurrencyControl.java | 8 +- ...TestMultiVersionConcurrencyControlBasic.java | 7 ++ .../regionserver/TestMutateRowsRecovery.java | 8 +- .../TestNewVersionBehaviorFromClientSide.java | 13 ++- .../TestObservedExceptionsInBatch.java | 6 ++ .../hbase/regionserver/TestParallelPut.java | 25 +++--- .../regionserver/TestPerColumnFamilyFlush.java | 8 +- .../hbase/regionserver/TestPriorityRpc.java | 17 ++-- .../hbase/regionserver/TestQosFunction.java | 43 +++++---- .../TestRSKilledWhenInitializing.java | 21 +++-- .../hbase/regionserver/TestRSStatusServlet.java | 11 ++- .../hbase/regionserver/TestRecoveredEdits.java | 14 ++- .../regionserver/TestRegionFavoredNodes.java | 11 ++- .../hbase/regionserver/TestRegionIncrement.java | 14 +-- .../regionserver/TestRegionInfoBuilder.java | 17 ++-- .../TestRegionMergeTransactionOnCluster.java | 43 ++++----- .../hbase/regionserver/TestRegionOpen.java | 19 ++-- .../regionserver/TestRegionReplicaFailover.java | 12 ++- .../hbase/regionserver/TestRegionReplicas.java | 10 ++- .../TestRegionReplicasAreDistributed.java | 7 +- .../TestRegionReplicasWithModifyTable.java | 8 +- .../TestRegionReplicasWithRestartScenarios.java | 16 ++-- .../regionserver/TestRegionServerAbort.java | 19 ++-- .../TestRegionServerAccounting.java | 7 +- .../regionserver/TestRegionServerHostname.java | 8 +- .../regionserver/TestRegionServerMetrics.java | 12 +-- .../regionserver/TestRegionServerNoMaster.java | 10 ++- .../TestRegionServerOnlineConfigChange.java | 13 ++- .../TestRegionServerReadRequestMetrics.java | 10 ++- .../TestRegionServerRegionSpaceUseReport.java | 24 +++-- .../TestRegionServerReportForDuty.java | 16 ++-- .../regionserver/TestRegionSplitPolicy.java | 7 +- .../regionserver/TestRemoveRegionMetrics.java | 16 ++-- .../regionserver/TestResettingCounters.java | 13 ++- .../regionserver/TestReversibleScanners.java | 34 ++++--- .../hbase/regionserver/TestRowTooBig.java | 12 ++- .../regionserver/TestRpcSchedulerFactory.java | 10 ++- .../regionserver/TestSCVFWithMiniCluster.java | 18 ++-- .../regionserver/TestScanWithBloomError.java | 10 ++- .../hadoop/hbase/regionserver/TestScanner.java | 13 +-- .../TestScannerHeartbeatMessages.java | 8 +- .../TestScannerRetriableFailure.java | 26 +++--- .../regionserver/TestScannerWithBulkload.java | 8 +- .../TestScannerWithCorruptHFile.java | 9 +- .../regionserver/TestSeekOptimizations.java | 14 +-- .../regionserver/TestServerNonceManager.java | 10 ++- .../TestSettingTimeoutOnBlockingPoint.java | 10 ++- .../TestSimpleTimeRangeTracker.java | 7 +- .../hbase/regionserver/TestSplitLogWorker.java | 9 +- .../TestSplitTransactionOnCluster.java | 14 +-- .../regionserver/TestSplitWalDataLoss.java | 7 +- .../hbase/regionserver/TestStoreFileInfo.java | 11 ++- .../TestStoreFileRefresherChore.java | 7 +- .../TestStoreFileScannerWithTagCompression.java | 8 +- .../hbase/regionserver/TestStoreScanner.java | 18 ++-- .../regionserver/TestStripeStoreEngine.java | 7 +- .../TestStripeStoreFileManager.java | 9 +- .../regionserver/TestSwitchToStreamRead.java | 7 +- .../regionserver/TestSyncTimeRangeTracker.java | 7 +- .../hadoop/hbase/regionserver/TestTags.java | 10 ++- .../TestTimestampFilterSeekHint.java | 15 ++-- .../hbase/regionserver/TestWALLockup.java | 13 ++- .../TestWALMonotonicallyIncreasingSeqId.java | 9 +- .../TestWalAndCompactingMemStoreFlush.java | 15 ++-- .../hbase/regionserver/TestWideScanner.java | 12 ++- .../TestCompactedHFilesDischarger.java | 12 ++- .../compactions/TestDateTieredCompactor.java | 7 +- .../compactions/TestFIFOCompactionPolicy.java | 7 +- .../compactions/TestOffPeakHours.java | 9 +- .../compactions/TestStripeCompactionPolicy.java | 8 +- .../compactions/TestStripeCompactor.java | 8 +- .../TestCompactionScanQueryMatcher.java | 7 +- .../querymatcher/TestExplicitColumnTracker.java | 11 ++- .../TestNewVersionBehaviorTracker.java | 14 +-- .../querymatcher/TestScanDeleteTracker.java | 10 ++- .../TestScanWildcardColumnTracker.java | 11 ++- .../querymatcher/TestUserScanQueryMatcher.java | 9 +- .../TestCompactionWithThroughputController.java | 8 +- .../TestFlushWithThroughputController.java | 31 +++++-- .../hbase/regionserver/wal/TestAsyncFSWAL.java | 17 ++-- .../wal/TestAsyncLogRollPeriod.java | 6 ++ .../regionserver/wal/TestAsyncLogRolling.java | 12 +-- .../regionserver/wal/TestAsyncProtobufLog.java | 20 +++-- .../regionserver/wal/TestAsyncWALReplay.java | 17 ++-- .../wal/TestAsyncWALReplayCompressed.java | 6 ++ .../hbase/regionserver/wal/TestCompressor.java | 15 ++-- .../wal/TestCustomWALCellCodec.java | 6 ++ .../hbase/regionserver/wal/TestDurability.java | 7 ++ .../hbase/regionserver/wal/TestFSHLog.java | 13 ++- .../hbase/regionserver/wal/TestFSWALEntry.java | 14 +-- .../regionserver/wal/TestLogRollAbort.java | 7 ++ .../regionserver/wal/TestLogRollPeriod.java | 6 ++ .../hbase/regionserver/wal/TestLogRolling.java | 12 +-- .../wal/TestLogRollingNoCluster.java | 12 +-- .../hbase/regionserver/wal/TestMetricsWAL.java | 22 +++-- .../hbase/regionserver/wal/TestProtobufLog.java | 9 +- .../wal/TestSecureAsyncWALReplay.java | 11 +-- .../regionserver/wal/TestSecureWALReplay.java | 8 +- .../wal/TestSequenceIdAccounting.java | 8 +- .../hbase/regionserver/wal/TestSyncFuture.java | 6 ++ .../wal/TestWALActionsListener.java | 7 +- .../wal/TestWALCellCodecWithCompression.java | 8 +- .../hbase/regionserver/wal/TestWALReplay.java | 13 ++- .../TestWALReplayBoundedLogWriterCreation.java | 9 +- .../wal/TestWALReplayCompressed.java | 6 ++ .../replication/TestMasterReplication.java | 6 ++ .../replication/TestMultiSlaveReplication.java | 13 +-- .../replication/TestNamespaceReplication.java | 9 +- .../replication/TestPerTableCFReplication.java | 16 ++-- ...estReplicationChangingPeerRegionservers.java | 11 ++- .../TestReplicationDisableInactivePeer.java | 13 ++- .../TestReplicationDroppedTables.java | 23 +++-- .../TestReplicationEmptyWALRecovery.java | 6 ++ .../replication/TestReplicationEndpoint.java | 9 +- .../TestReplicationKillMasterRS.java | 8 +- .../TestReplicationKillMasterRSCompressed.java | 7 +- .../replication/TestReplicationKillRS.java | 13 ++- .../replication/TestReplicationKillSlaveRS.java | 8 +- .../TestReplicationProcedureRetry.java | 7 +- .../replication/TestReplicationSmallTests.java | 6 ++ .../replication/TestReplicationSource.java | 11 ++- .../replication/TestReplicationStatus.java | 7 ++ .../replication/TestReplicationSyncUpTool.java | 15 ++-- .../TestReplicationTrackerZKImpl.java | 10 ++- .../TestReplicationWALEntryFilters.java | 10 ++- .../replication/TestReplicationWithTags.java | 7 +- .../replication/TestSerialReplication.java | 12 ++- .../replication/master/TestTableCFsUpdater.java | 22 ++--- ...ReplicationEndpointWithMultipleAsyncWAL.java | 7 ++ .../TestReplicationEndpointWithMultipleWAL.java | 7 ++ ...lMasterRSCompressedWithMultipleAsyncWAL.java | 7 ++ ...onKillMasterRSCompressedWithMultipleWAL.java | 7 ++ ...plicationSyncUpToolWithMultipleAsyncWAL.java | 7 ++ ...estReplicationSyncUpToolWithMultipleWAL.java | 7 ++ .../regionserver/TestGlobalThrottler.java | 12 ++- .../TestRegionReplicaReplicationEndpoint.java | 18 ++-- ...egionReplicaReplicationEndpointNoMaster.java | 25 ++++-- .../regionserver/TestReplicationSink.java | 25 ++++-- .../TestReplicationSinkManager.java | 16 ++-- .../TestReplicationSourceManager.java | 6 ++ .../TestReplicationSourceManagerZkImpl.java | 6 ++ .../regionserver/TestReplicationThrottler.java | 8 +- .../regionserver/TestReplicator.java | 11 ++- .../regionserver/TestWALEntrySinkFilter.java | 15 ++-- .../regionserver/TestWALEntryStream.java | 6 ++ .../hadoop/hbase/security/TestSecureIPC.java | 20 +++-- .../apache/hadoop/hbase/security/TestUser.java | 18 ++-- .../TestUsersOperationsWithSecureHadoop.java | 10 ++- .../access/TestAccessControlFilter.java | 15 ++-- .../security/access/TestAccessController.java | 9 +- .../security/access/TestAccessController2.java | 14 ++- .../security/access/TestAccessController3.java | 11 ++- .../access/TestCellACLWithMultipleVersions.java | 12 ++- .../hbase/security/access/TestCellACLs.java | 12 ++- .../TestCoprocessorWhitelistMasterObserver.java | 17 ++-- .../security/access/TestNamespaceCommands.java | 15 +++- .../access/TestScanEarlyTermination.java | 12 ++- .../security/access/TestTablePermissions.java | 15 +++- .../access/TestWithDisabledAuthorization.java | 12 ++- .../access/TestZKPermissionWatcher.java | 12 ++- .../security/token/TestAuthenticationKey.java | 14 +-- .../TestDelegationTokenWithEncryption.java | 7 +- .../token/TestGenerateDelegationToken.java | 8 +- .../security/token/TestTokenAuthentication.java | 24 +++-- .../security/token/TestZKSecretWatcher.java | 11 ++- .../token/TestZKSecretWatcherRefreshKeys.java | 10 ++- .../TestDefaultScanLabelGeneratorStack.java | 9 +- .../TestEnforcingScanLabelGenerator.java | 7 +- .../visibility/TestExpressionExpander.java | 10 ++- .../visibility/TestExpressionParser.java | 10 ++- ...sibilityLabelReplicationWithExpAsString.java | 8 +- ...sibilityLabelsOpWithDifferentUsersNoACL.java | 17 ++-- .../TestVisibilityLabelsReplication.java | 8 +- .../visibility/TestVisibilityLabelsWithACL.java | 14 +-- ...VisibilityLabelsWithCustomVisLabService.java | 7 +- ...ibilityLabelsWithDefaultVisLabelService.java | 13 ++- .../TestVisibilityLabelsWithDeletes.java | 8 +- .../TestVisibilityLabelsWithSLGStack.java | 9 +- .../TestVisibilityLablesWithGroups.java | 10 ++- .../TestVisibilityWithCheckAuths.java | 8 +- .../TestWithDisabledAuthorization.java | 10 ++- .../snapshot/TestFlushSnapshotFromClient.java | 20 ++--- .../TestMobFlushSnapshotFromClient.java | 11 ++- .../TestMobRestoreFlushSnapshotFromClient.java | 8 +- .../snapshot/TestMobRestoreSnapshotHelper.java | 10 ++- .../hbase/snapshot/TestRegionSnapshotTask.java | 32 ++++--- .../TestRestoreFlushSnapshotFromClient.java | 8 +- .../snapshot/TestRestoreSnapshotHelper.java | 15 +++- .../snapshot/TestSnapshotClientRetries.java | 15 ++-- .../snapshot/TestSnapshotDescriptionUtils.java | 11 ++- .../hbase/snapshot/TestSnapshotManifest.java | 20 +++-- .../hadoop/hbase/tool/TestCanaryTool.java | 39 ++++---- .../hbase/tool/TestLoadIncrementalHFiles.java | 12 ++- .../TestLoadIncrementalHFilesSplitRecovery.java | 12 ++- .../tool/TestSecureLoadIncrementalHFiles.java | 8 +- ...ecureLoadIncrementalHFilesSplitRecovery.java | 6 ++ .../hadoop/hbase/trace/TestHTraceHooks.java | 14 ++- .../hadoop/hbase/util/TestBloomFilterChunk.java | 12 +-- .../util/TestBoundedPriorityBlockingQueue.java | 37 ++++---- .../hadoop/hbase/util/TestByteBuffUtils.java | 33 ++++--- .../hadoop/hbase/util/TestCompressionTest.java | 24 ++--- .../hbase/util/TestConfigurationUtil.java | 25 +++--- .../hadoop/hbase/util/TestConnectionCache.java | 12 ++- .../hbase/util/TestCoprocessorScanPolicy.java | 11 ++- .../hbase/util/TestDefaultEnvironmentEdge.java | 15 ++-- .../hadoop/hbase/util/TestEncryptionTest.java | 13 +-- .../hadoop/hbase/util/TestFSHDFSUtils.java | 14 +-- .../hbase/util/TestFSTableDescriptors.java | 12 ++- .../apache/hadoop/hbase/util/TestFSUtils.java | 9 +- .../apache/hadoop/hbase/util/TestFSVisitor.java | 13 ++- .../hbase/util/TestFromClientSide3WoUnsafe.java | 8 +- .../hbase/util/TestHBaseFsckComparator.java | 9 +- .../hbase/util/TestHBaseFsckEncryption.java | 10 ++- .../hadoop/hbase/util/TestHBaseFsckMOB.java | 22 +++-- .../hbase/util/TestHBaseFsckReplication.java | 6 ++ .../hadoop/hbase/util/TestHFileArchiveUtil.java | 16 ++-- .../apache/hadoop/hbase/util/TestIdLock.java | 11 ++- .../hadoop/hbase/util/TestIdReadWriteLock.java | 13 +-- .../util/TestIncrementingEnvironmentEdge.java | 9 +- .../hadoop/hbase/util/TestJSONMetricUtil.java | 21 +++-- .../hbase/util/TestMiniClusterLoadEncoded.java | 32 ++++--- .../hbase/util/TestMiniClusterLoadParallel.java | 31 ++++--- .../util/TestMiniClusterLoadSequential.java | 31 ++++--- .../apache/hadoop/hbase/util/TestPoolMap.java | 10 ++- .../hadoop/hbase/util/TestRegionMover.java | 11 ++- .../hbase/util/TestRegionSplitCalculator.java | 16 ++-- .../hadoop/hbase/util/TestRegionSplitter.java | 11 ++- .../apache/hadoop/hbase/util/TestRootPath.java | 13 +-- .../hadoop/hbase/util/TestSortedList.java | 15 ++-- .../hadoop/hbase/util/TestStealJobQueue.java | 24 ++--- .../wal/TestBoundedRegionGroupingStrategy.java | 8 +- .../hadoop/hbase/wal/TestFSHLogProvider.java | 9 +- .../apache/hadoop/hbase/wal/TestSecureWAL.java | 6 ++ .../apache/hadoop/hbase/wal/TestWALFactory.java | 7 ++ .../hadoop/hbase/wal/TestWALFiltering.java | 22 +++-- .../apache/hadoop/hbase/wal/TestWALMethods.java | 17 ++-- .../wal/TestWALOpenAfterDNRollingStart.java | 8 +- .../hbase/wal/TestWALReaderOnSecureWAL.java | 9 +- .../apache/hadoop/hbase/wal/TestWALRootDir.java | 7 ++ .../apache/hadoop/hbase/wal/TestWALSplit.java | 8 +- .../TestWALSplitBoundedLogWriterCreation.java | 8 +- .../hbase/wal/TestWALSplitCompressed.java | 8 +- .../hbase/zookeeper/TestZooKeeperACL.java | 9 +- .../hbase/client/TestReplicationShell.java | 8 +- .../apache/hadoop/hbase/client/TestShell.java | 8 +- .../hadoop/hbase/client/TestShellNoCluster.java | 8 +- .../hbase/client/rsgroup/TestShellRSGroups.java | 15 ++-- .../hbase/spark/TestJavaHBaseContext.java | 27 +++--- .../hadoop/hbase/thrift/TestCallQueue.java | 36 ++++---- .../hbase/thrift/TestThriftHttpServer.java | 35 ++++---- .../hadoop/hbase/thrift/TestThriftServer.java | 11 ++- .../hbase/thrift/TestThriftServerCmdLine.java | 35 ++++---- .../thrift2/TestThriftHBaseServiceHandler.java | 11 ++- ...TestThriftHBaseServiceHandlerWithLabels.java | 8 +- ...stThriftHBaseServiceHandlerWithReadOnly.java | 10 ++- .../hadoop/hbase/zookeeper/TestHQuorumPeer.java | 8 +- .../hbase/zookeeper/TestInstancePending.java | 8 +- .../hbase/zookeeper/TestReadOnlyZKClient.java | 6 ++ .../zookeeper/TestRecoverableZooKeeper.java | 7 +- .../hbase/zookeeper/TestZKLeaderManager.java | 8 +- .../hbase/zookeeper/TestZKMainServer.java | 9 +- .../hadoop/hbase/zookeeper/TestZKMulti.java | 10 ++- .../hbase/zookeeper/TestZKNodeTracker.java | 9 +- .../hadoop/hbase/zookeeper/TestZKUtil.java | 6 ++ .../hbase/zookeeper/TestZKUtilNoServer.java | 19 ++-- pom.xml | 6 ++ 1145 files changed, 10811 insertions(+), 5210 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/ReorderImports.class ---------------------------------------------------------------------- diff --git a/ReorderImports.class b/ReorderImports.class new file mode 100644 index 0000000..a924819 Binary files /dev/null and b/ReorderImports.class differ http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java ---------------------------------------------------------------------- diff --git a/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java b/hbase-archetypes/hbase-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/client/TestHelloHBase.java index be028be..9a92e60 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 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -21,7 +20,7 @@ package org.apache.hbase.archetypes.exemplars.client; 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.NamespaceDescriptor; import org.apache.hadoop.hbase.client.Admin; @@ -33,6 +32,7 @@ import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -42,6 +42,10 @@ import org.junit.experimental.categories.Category; @Category(MediumTests.class) public class TestHelloHBase { + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestHelloHBase.class); + private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java ---------------------------------------------------------------------- diff --git a/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java b/hbase-archetypes/hbase-shaded-client-project/src/test/java/org/apache/hbase/archetypes/exemplars/shaded_client/TestHelloHBase.java index 1656e35..0f0f7d9 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 @@ -1,5 +1,4 @@ /** - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -21,7 +20,7 @@ package org.apache.hbase.archetypes.exemplars.shaded_client; 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.NamespaceDescriptor; import org.apache.hadoop.hbase.client.Admin; @@ -33,6 +32,7 @@ import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -42,6 +42,10 @@ import org.junit.experimental.categories.Category; @Category(MediumTests.class) public class TestHelloHBase { + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestHelloHBase.class); + private static final HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java index a240bd8..e4c74cf 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupBoundaryTests.java @@ -15,22 +15,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.backup; import java.io.IOException; import java.util.List; - +import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.testclassification.LargeTests; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.collect.Lists; @Category(LargeTests.class) public class TestBackupBoundaryTests extends TestBackupBase { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestBackupBoundaryTests.class); + private static final Logger LOG = LoggerFactory.getLogger(TestBackupBoundaryTests.class); /** http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java index c9fc84f..acde21e3 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupCommandLineTool.java @@ -22,18 +22,23 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.PrintStream; - import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.hadoop.util.ToolRunner; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; @Category(SmallTests.class) public class TestBackupCommandLineTool { + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestBackupCommandLineTool.class); + private final static String USAGE_DESCRIBE = "Usage: hbase backup describe <backup_id>"; private final static String USAGE_CREATE = "Usage: hbase backup create"; private final static String USAGE_HISTORY = "Usage: hbase backup history"; http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDelete.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDelete.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDelete.java index 517d516..9e67ff7 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDelete.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDelete.java @@ -1,13 +1,13 @@ /** * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.backup; import static org.junit.Assert.assertTrue; @@ -23,21 +22,28 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.List; - import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.util.ToolRunner; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.collect.Lists; @Category(LargeTests.class) public class TestBackupDelete extends TestBackupBase { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestBackupDelete.class); + private static final Logger LOG = LoggerFactory.getLogger(TestBackupDelete.class); /** http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java index 86cd276..a557b9b 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteRestore.java @@ -1,35 +1,48 @@ /** - * Licensed to the Apache Software Foundation (ASF) under one or more contributor license - * agreements. See the NOTICE file distributed with this work for additional information regarding - * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. You may obtain a - * copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable - * law or agreed to in writing, software distributed under the License is distributed on an "AS IS" - * BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License - * for the specific language governing permissions and limitations under the License. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ - package org.apache.hadoop.hbase.backup; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.util.List; - +import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.util.BackupUtils; import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.collect.Lists; @Category(MediumTests.class) public class TestBackupDeleteRestore extends TestBackupBase { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestBackupDeleteRestore.class); + private static final Logger LOG = LoggerFactory.getLogger(TestBackupDeleteRestore.class); /** http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDeleteWithFailures.java ---------------------------------------------------------------------- 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 66cb762..27cf07a 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 @@ -1,5 +1,4 @@ -/* - * +/** * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -25,9 +24,9 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; 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.HConstants; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; @@ -43,10 +42,12 @@ import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.util.ToolRunner; import org.junit.Before; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.collect.Lists; /** @@ -56,6 +57,11 @@ import org.apache.hbase.thirdparty.com.google.common.collect.Lists; */ @Category(LargeTests.class) public class TestBackupDeleteWithFailures extends TestBackupBase{ + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestBackupDeleteWithFailures.class); + private static final Logger LOG = LoggerFactory.getLogger(TestBackupDeleteWithFailures.class); public enum Failure { http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java ---------------------------------------------------------------------- diff --git a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java index 8e19076..6ab3d04 100644 --- a/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java +++ b/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupDescribe.java @@ -1,13 +1,13 @@ /** * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file + * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * with the License. You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.hadoop.hbase.backup; import static org.junit.Assert.assertNotEquals; @@ -24,21 +23,28 @@ import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.util.List; - +import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupInfo.BackupState; import org.apache.hadoop.hbase.backup.impl.BackupCommands; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; import org.apache.hadoop.hbase.testclassification.LargeTests; import org.apache.hadoop.util.ToolRunner; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import org.apache.hbase.thirdparty.com.google.common.collect.Lists; @Category(LargeTests.class) public class TestBackupDescribe extends TestBackupBase { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestBackupDescribe.class); + private static final Logger LOG = LoggerFactory.getLogger(TestBackupDescribe.class); /** http://git-wip-us.apache.org/repos/asf/hbase/blob/918599ef/hbase-backup/src/test/java/org/apache/hadoop/hbase/backup/TestBackupHFileCleaner.java ---------------------------------------------------------------------- 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 0a54a2d..8d22f27 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 @@ -25,11 +25,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; - import org.apache.hadoop.conf.Configuration; 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.TableName; import org.apache.hadoop.hbase.backup.impl.BackupSystemTable; @@ -41,6 +41,7 @@ import org.junit.After; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.ClassRule; import org.junit.Test; import org.junit.experimental.categories.Category; import org.slf4j.Logger; @@ -48,6 +49,11 @@ import org.slf4j.LoggerFactory; @Category({ MasterTests.class, SmallTests.class }) public class TestBackupHFileCleaner { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestBackupHFileCleaner.class); + private static final Logger LOG = LoggerFactory.getLogger(TestBackupHFileCleaner.class); private final static HBaseTestingUtility TEST_UTIL = new HBaseTestingUtility(); private static Configuration conf = TEST_UTIL.getConfiguration();
