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 2017/12/21 13:25:25 UTC
[36/42] hbase git commit: HBASE-10092 Move up on to log4j2
HBASE-10092 Move up on to log4j2
Changes:
- replaced commons-logging to slf4j everywhere
- log.XXX(Throwable) calls were replaced with log.XXX(t.toString(), t)
- log.XXX(Object) calls were replaced with log.XXX(Objects.toString(obj))
- log.fatal() calls were replaced with log.error(HBaseMarkers.FATAL, ...)
- programmatic log4j configuration was removed from the unit test
This commit does not affect the current logging configurations, because log4j
is still on the classpath. slf4j-log4j12 binds log4j to slf4j.
Signed-off-by: Michael Stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f572c4b8
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f572c4b8
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f572c4b8
Branch: refs/heads/HBASE-19397
Commit: f572c4b80e2bef91f582ed5b535c4ba695d63a2d
Parents: 7f938dd
Author: Balazs Meszaros <ba...@cloudera.com>
Authored: Mon Dec 18 11:14:30 2017 +0100
Committer: Michael Stack <st...@apache.org>
Committed: Wed Dec 20 22:21:33 2017 -0800
----------------------------------------------------------------------
hbase-backup/pom.xml | 4 +-
.../hadoop/hbase/backup/BackupDriver.java | 19 ++---
.../hadoop/hbase/backup/BackupHFileCleaner.java | 6 +-
.../apache/hadoop/hbase/backup/BackupInfo.java | 8 +-
.../hadoop/hbase/backup/BackupObserver.java | 6 +-
.../hadoop/hbase/backup/HBackupFileSystem.java | 6 +-
.../apache/hadoop/hbase/backup/LogUtils.java | 11 ++-
.../hadoop/hbase/backup/RestoreDriver.java | 13 ++-
.../hbase/backup/impl/BackupAdminImpl.java | 6 +-
.../hadoop/hbase/backup/impl/BackupManager.java | 10 +--
.../hbase/backup/impl/BackupManifest.java | 7 +-
.../hbase/backup/impl/BackupSystemTable.java | 12 +--
.../backup/impl/FullTableBackupClient.java | 6 +-
.../backup/impl/IncrementalBackupManager.java | 8 +-
.../impl/IncrementalTableBackupClient.java | 6 +-
.../hbase/backup/impl/RestoreTablesClient.java | 6 +-
.../hbase/backup/impl/TableBackupClient.java | 6 +-
.../mapreduce/MapReduceBackupCopyJob.java | 11 +--
.../mapreduce/MapReduceBackupMergeJob.java | 8 +-
.../mapreduce/MapReduceHFileSplitterJob.java | 6 +-
.../backup/mapreduce/MapReduceRestoreJob.java | 8 +-
.../hbase/backup/master/BackupLogCleaner.java | 6 +-
.../master/LogRollMasterProcedureManager.java | 6 +-
.../regionserver/LogRollBackupSubprocedure.java | 8 +-
.../LogRollBackupSubprocedurePool.java | 6 +-
.../LogRollRegionServerProcedureManager.java | 7 +-
.../hadoop/hbase/backup/util/BackupUtils.java | 6 +-
.../hadoop/hbase/backup/util/RestoreTool.java | 8 +-
.../hadoop/hbase/backup/TestBackupBase.java | 9 +-
.../hbase/backup/TestBackupBoundaryTests.java | 7 +-
.../hadoop/hbase/backup/TestBackupDelete.java | 7 +-
.../hbase/backup/TestBackupDeleteRestore.java | 7 +-
.../backup/TestBackupDeleteWithFailures.java | 7 +-
.../hadoop/hbase/backup/TestBackupDescribe.java | 7 +-
.../hbase/backup/TestBackupHFileCleaner.java | 6 +-
.../hbase/backup/TestBackupMultipleDeletes.java | 7 +-
.../hadoop/hbase/backup/TestBackupRepair.java | 6 +-
.../hbase/backup/TestBackupShowHistory.java | 7 +-
.../hbase/backup/TestBackupStatusProgress.java | 7 +-
.../hadoop/hbase/backup/TestFullBackup.java | 6 +-
.../hadoop/hbase/backup/TestFullBackupSet.java | 6 +-
.../backup/TestFullBackupSetRestoreSet.java | 6 +-
.../backup/TestFullBackupWithFailures.java | 6 +-
.../hadoop/hbase/backup/TestFullRestore.java | 7 +-
.../hbase/backup/TestIncrementalBackup.java | 7 +-
.../TestIncrementalBackupDeleteTable.java | 7 +-
.../TestIncrementalBackupMergeWithFailures.java | 9 +-
.../TestIncrementalBackupWithBulkLoad.java | 6 +-
.../TestIncrementalBackupWithFailures.java | 8 +-
.../hadoop/hbase/backup/TestRemoteBackup.java | 7 +-
.../hadoop/hbase/backup/TestRemoteRestore.java | 6 +-
.../backup/TestRepairAfterFailedDelete.java | 7 +-
.../hbase/backup/TestRestoreBoundaryTests.java | 6 +-
.../hbase/backup/TestSystemTableSnapshot.java | 6 +-
.../backup/master/TestBackupLogCleaner.java | 10 +--
hbase-client/pom.xml | 4 +-
.../hadoop/hbase/AsyncMetaTableAccessor.java | 6 +-
.../org/apache/hadoop/hbase/HRegionInfo.java | 7 +-
.../apache/hadoop/hbase/MetaTableAccessor.java | 9 +-
.../client/AsyncBatchRpcRetryingCaller.java | 6 +-
.../hbase/client/AsyncConnectionImpl.java | 6 +-
.../hbase/client/AsyncMetaRegionLocator.java | 6 +-
.../hbase/client/AsyncNonMetaRegionLocator.java | 6 +-
.../hadoop/hbase/client/AsyncProcess.java | 6 +-
.../hadoop/hbase/client/AsyncRegionLocator.java | 6 +-
.../hbase/client/AsyncRequestFutureImpl.java | 6 +-
.../hbase/client/AsyncRpcRetryingCaller.java | 6 +-
.../AsyncScanSingleRegionRpcRetryingCaller.java | 8 +-
.../hbase/client/AsyncTableResultScanner.java | 6 +-
.../apache/hadoop/hbase/client/BatchErrors.java | 6 +-
.../hbase/client/BufferedMutatorImpl.java | 19 +++--
.../hadoop/hbase/client/ClientIdGenerator.java | 6 +-
.../hadoop/hbase/client/ClientScanner.java | 6 +-
.../hbase/client/ClusterStatusListener.java | 7 +-
.../hbase/client/ConnectionImplementation.java | 12 +--
.../hadoop/hbase/client/ConnectionUtils.java | 9 +-
.../hadoop/hbase/client/DelayingRunner.java | 6 +-
.../hbase/client/FlushRegionCallable.java | 7 +-
.../org/apache/hadoop/hbase/client/Get.java | 6 +-
.../apache/hadoop/hbase/client/HBaseAdmin.java | 6 +-
.../org/apache/hadoop/hbase/client/HTable.java | 6 +-
.../hadoop/hbase/client/HTableMultiplexer.java | 7 +-
.../apache/hadoop/hbase/client/MetaCache.java | 6 +-
.../client/PreemptiveFastFailInterceptor.java | 8 +-
.../hadoop/hbase/client/RawAsyncHBaseAdmin.java | 7 +-
.../client/RegionCoprocessorRpcChannel.java | 6 +-
.../hadoop/hbase/client/RegionInfoBuilder.java | 6 +-
.../client/ResultBoundedCompletionService.java | 6 +-
.../RetryingCallerInterceptorFactory.java | 8 +-
.../hbase/client/RpcRetryingCallerFactory.java | 10 +--
.../hbase/client/RpcRetryingCallerImpl.java | 8 +-
.../RpcRetryingCallerWithReadReplicas.java | 8 +-
.../org/apache/hadoop/hbase/client/Scan.java | 6 +-
.../hadoop/hbase/client/ScannerCallable.java | 6 +-
.../client/ScannerCallableWithReplicas.java | 6 +-
.../hbase/client/SimpleRequestController.java | 7 +-
.../hbase/client/SyncCoprocessorRpcChannel.java | 6 +-
.../hbase/client/TableDescriptorBuilder.java | 6 +-
.../hadoop/hbase/client/ZKAsyncRegistry.java | 7 +-
.../backoff/ClientBackoffPolicyFactory.java | 6 +-
.../backoff/ExponentialClientBackoffPolicy.java | 7 +-
.../client/replication/ReplicationAdmin.java | 6 +-
.../replication/ReplicationPeerConfigUtil.java | 37 +++++----
.../hbase/exceptions/RegionMovedException.java | 6 +-
.../exceptions/RegionOpeningException.java | 6 +-
.../apache/hadoop/hbase/filter/ParseFilter.java | 6 +-
.../hbase/filter/RegexStringComparator.java | 7 +-
.../hadoop/hbase/ipc/AbstractRpcClient.java | 6 +-
.../hadoop/hbase/ipc/BlockingRpcConnection.java | 16 ++--
.../hadoop/hbase/ipc/CellBlockBuilder.java | 6 +-
.../hadoop/hbase/ipc/CoprocessorRpcUtils.java | 6 +-
.../apache/hadoop/hbase/ipc/FailedServers.java | 6 +-
.../hadoop/hbase/ipc/NettyRpcConnection.java | 6 +-
.../hadoop/hbase/ipc/NettyRpcDuplexHandler.java | 6 +-
.../apache/hadoop/hbase/ipc/RpcConnection.java | 6 +-
.../hadoop/hbase/ipc/RpcControllerFactory.java | 6 +-
.../hadoop/hbase/quotas/QuotaRetriever.java | 6 +-
.../hadoop/hbase/quotas/QuotaTableUtil.java | 6 +-
.../security/AbstractHBaseSaslRpcClient.java | 6 +-
.../hadoop/hbase/security/EncryptionUtil.java | 6 +-
.../hbase/security/HBaseSaslRpcClient.java | 6 +-
.../hbase/security/NettyHBaseSaslRpcClient.java | 6 +-
.../NettyHBaseSaslRpcClientHandler.java | 6 +-
.../apache/hadoop/hbase/security/SaslUtil.java | 6 +-
.../hbase/security/access/Permission.java | 6 +-
.../hbase/security/access/UserPermission.java | 6 +-
.../token/AuthenticationTokenSelector.java | 6 +-
.../shaded/protobuf/ResponseConverter.java | 7 +-
.../hbase/zookeeper/ReadOnlyZKClient.java | 7 +-
.../hadoop/hbase/TestHTableDescriptor.java | 6 +-
.../hbase/TestInterfaceAudienceAnnotations.java | 13 +--
.../hadoop/hbase/client/TestAsyncProcess.java | 6 +-
.../hbase/client/TestClientNoCluster.java | 12 +--
.../hadoop/hbase/client/TestInterfaceAlign.java | 6 +-
.../hbase/client/TestSnapshotFromAdmin.java | 7 +-
.../client/TestTableDescriptorBuilder.java | 6 +-
.../hadoop/hbase/ipc/TestCellBlockBuilder.java | 11 +--
hbase-common/pom.xml | 4 +-
.../java/org/apache/hadoop/hbase/AuthUtil.java | 6 +-
.../apache/hadoop/hbase/CellComparatorImpl.java | 6 +-
.../org/apache/hadoop/hbase/ChoreService.java | 10 +--
.../apache/hadoop/hbase/HBaseConfiguration.java | 6 +-
.../java/org/apache/hadoop/hbase/KeyValue.java | 13 +--
.../org/apache/hadoop/hbase/ScheduledChore.java | 7 +-
.../apache/hadoop/hbase/codec/BaseDecoder.java | 7 +-
.../hbase/io/ByteBufferListOutputStream.java | 8 +-
.../apache/hadoop/hbase/io/ByteBufferPool.java | 6 +-
.../hadoop/hbase/io/compress/Compression.java | 6 +-
.../io/compress/ReusableStreamGzipCodec.java | 10 +--
.../hadoop/hbase/io/crypto/Encryption.java | 13 +--
.../apache/hadoop/hbase/io/crypto/aes/AES.java | 7 +-
.../hbase/io/crypto/aes/CommonsCryptoAES.java | 7 +-
.../hbase/io/encoding/RowIndexEncoderV1.java | 6 +-
.../apache/hadoop/hbase/log/HBaseMarkers.java | 31 +++++++
.../hadoop/hbase/security/Superusers.java | 6 +-
.../hbase/trace/HBaseHTraceConfiguration.java | 6 +-
.../hadoop/hbase/trace/SpanReceiverHost.java | 6 +-
.../hadoop/hbase/util/AbstractHBaseTool.java | 6 +-
.../org/apache/hadoop/hbase/util/Base64.java | 9 +-
.../hadoop/hbase/util/ByteBufferArray.java | 9 +-
.../org/apache/hadoop/hbase/util/Bytes.java | 24 +++---
.../org/apache/hadoop/hbase/util/ClassSize.java | 9 +-
.../apache/hadoop/hbase/util/CommonFSUtils.java | 12 +--
.../hbase/util/CoprocessorClassLoader.java | 8 +-
.../hadoop/hbase/util/DynamicClassLoader.java | 8 +-
.../org/apache/hadoop/hbase/util/JSONBean.java | 8 +-
.../hadoop/hbase/util/JSONMetricUtil.java | 8 +-
.../java/org/apache/hadoop/hbase/util/JVM.java | 6 +-
.../org/apache/hadoop/hbase/util/MD5Hash.java | 6 +-
.../org/apache/hadoop/hbase/util/Methods.java | 14 ++--
.../apache/hadoop/hbase/util/PrettyPrinter.java | 6 +-
.../hadoop/hbase/util/ReflectionUtils.java | 7 +-
.../apache/hadoop/hbase/util/RetryCounter.java | 6 +-
.../org/apache/hadoop/hbase/util/Sleeper.java | 6 +-
.../org/apache/hadoop/hbase/util/Threads.java | 6 +-
.../apache/hadoop/hbase/util/UnsafeAccess.java | 13 +--
.../hadoop/hbase/util/UnsafeAvailChecker.java | 6 +-
.../apache/hadoop/hbase/util/VersionInfo.java | 6 +-
.../org/apache/hadoop/hbase/ClassFinder.java | 6 +-
.../hadoop/hbase/HBaseCommonTestingUtility.java | 6 +-
.../apache/hadoop/hbase/ResourceChecker.java | 6 +-
.../apache/hadoop/hbase/TestChoreService.java | 6 +-
.../apache/hadoop/hbase/TestClassFinder.java | 6 +-
.../hadoop/hbase/TestHBaseConfiguration.java | 7 +-
.../org/apache/hadoop/hbase/TestKeyValue.java | 9 +-
.../java/org/apache/hadoop/hbase/Waiter.java | 6 +-
.../hadoop/hbase/io/crypto/TestEncryption.java | 6 +-
.../io/crypto/TestKeyStoreKeyProvider.java | 6 +-
.../hbase/util/ClassLoaderTestHelper.java | 6 +-
.../hadoop/hbase/util/LoadTestKVGenerator.java | 6 +-
.../hadoop/hbase/util/TestCommonFSUtils.java | 6 +-
.../hbase/util/TestDynamicClassLoader.java | 6 +-
.../hadoop/hbase/util/TestShowProperties.java | 6 +-
.../apache/hadoop/hbase/util/TestThreads.java | 6 +-
hbase-endpoint/pom.xml | 4 +-
.../client/coprocessor/AggregationClient.java | 6 +-
.../coprocessor/AggregateImplementation.java | 6 +-
.../apache/hadoop/hbase/coprocessor/Export.java | 9 +-
.../security/access/SecureBulkLoadEndpoint.java | 6 +-
.../coprocessor/ColumnAggregationEndpoint.java | 6 +-
.../ColumnAggregationEndpointNullResponse.java | 8 +-
.../ColumnAggregationEndpointWithErrors.java | 8 +-
.../TestBatchCoprocessorEndpoint.java | 6 +-
.../hbase/coprocessor/TestClassLoading.java | 6 +-
.../coprocessor/TestCoprocessorEndpoint.java | 6 +-
.../coprocessor/TestRowProcessorEndpoint.java | 6 +-
.../hbase/coprocessor/TestSecureExport.java | 9 +-
...gionServerBulkLoadWithOldSecureEndpoint.java | 9 +-
.../regionserver/TestServerCustomProtocol.java | 6 +-
...ReplicationSyncUpToolWithBulkLoadedData.java | 8 +-
hbase-examples/pom.xml | 4 +-
.../client/example/AsyncClientExample.java | 6 +-
.../client/example/BufferedMutatorExample.java | 28 +++----
.../example/MultiThreadedClientExample.java | 8 +-
.../client/example/RefreshHFilesClient.java | 6 +-
.../coprocessor/example/BulkDeleteEndpoint.java | 10 +--
.../ExampleMasterObserverWithMetrics.java | 6 +-
.../example/RefreshHFilesEndpoint.java | 7 +-
.../example/TestRefreshHFilesEndpoint.java | 8 +-
hbase-external-blockcache/pom.xml | 4 +-
.../hbase/io/hfile/MemcachedBlockCache.java | 6 +-
hbase-hadoop-compat/pom.xml | 4 +-
.../hadoop/hbase/CompatibilityFactory.java | 10 +--
.../hbase/CompatibilitySingletonFactory.java | 10 +--
hbase-hadoop2-compat/pom.xml | 4 +-
.../apache/hadoop/hbase/mapreduce/JobUtil.java | 6 +-
.../impl/GlobalMetricRegistriesAdapter.java | 7 +-
.../impl/HBaseMetrics2HadoopMetricsAdapter.java | 8 +-
.../MetricsRegionAggregateSourceImpl.java | 6 +-
.../regionserver/MetricsRegionSourceImpl.java | 6 +-
.../MetricsTableAggregateSourceImpl.java | 6 +-
.../regionserver/MetricsTableSourceImpl.java | 6 +-
.../hadoop/metrics2/impl/JmxCacheBuster.java | 6 +-
.../lib/DefaultMetricsSystemHelper.java | 9 +-
.../metrics2/lib/DynamicMetricsRegistry.java | 6 +-
hbase-http/pom.xml | 5 +-
.../hadoop/hbase/http/HttpRequestLog.java | 87 +++++++++++---------
.../apache/hadoop/hbase/http/HttpServer.java | 6 +-
.../hadoop/hbase/http/jmx/JMXJsonServlet.java | 6 +-
.../hbase/http/lib/StaticUserWebFilter.java | 17 ++--
.../apache/hadoop/hbase/http/log/LogLevel.java | 16 ++--
.../hadoop/hbase/http/TestGlobalFilter.java | 6 +-
.../hadoop/hbase/http/TestHttpServer.java | 6 +-
.../hbase/http/TestHttpServerWebapps.java | 7 +-
.../hadoop/hbase/http/TestPathFilter.java | 6 +-
.../hadoop/hbase/http/TestSSLHttpServer.java | 6 +-
.../hadoop/hbase/http/TestServletFilter.java | 6 +-
.../hadoop/hbase/http/TestSpnegoHttpServer.java | 10 +--
.../hbase/http/jmx/TestJMXJsonServlet.java | 6 +-
.../hadoop/hbase/http/log/TestLogLevel.java | 23 ++++--
.../hbase/http/resource/JerseyResource.java | 6 +-
hbase-it/pom.xml | 4 +-
.../hadoop/hbase/DistributedHBaseCluster.java | 5 +-
.../hadoop/hbase/HBaseClusterManager.java | 8 +-
.../hbase/IntegrationTestBackupRestore.java | 7 +-
.../hadoop/hbase/IntegrationTestBase.java | 8 +-
.../hbase/IntegrationTestDDLMasterFailover.java | 11 +--
.../hadoop/hbase/IntegrationTestIngest.java | 7 +-
.../IntegrationTestIngestWithEncryption.java | 21 ++---
.../hbase/IntegrationTestLazyCfLoading.java | 6 +-
.../hbase/IntegrationTestManyRegions.java | 8 +-
.../hbase/IntegrationTestMetaReplicas.java | 6 +-
.../hbase/IntegrationTestRegionReplicaPerf.java | 6 +-
.../hadoop/hbase/IntegrationTestsDriver.java | 6 +-
.../hadoop/hbase/RESTApiClusterManager.java | 8 +-
.../StripeCompactionsPerformanceEvaluation.java | 12 +--
.../hadoop/hbase/chaos/actions/Action.java | 6 +-
.../actions/RollingBatchRestartRsAction.java | 6 +-
.../hbase/chaos/factories/MonkeyFactory.java | 6 +-
.../chaos/monkies/PolicyBasedChaosMonkey.java | 6 +-
.../hadoop/hbase/chaos/policies/Policy.java | 6 +-
.../hbase/chaos/util/ChaosMonkeyRunner.java | 9 +-
.../apache/hadoop/hbase/chaos/util/Monkeys.java | 7 +-
.../hbase/ipc/IntegrationTestRpcClient.java | 13 ++-
.../mapreduce/IntegrationTestBulkLoad.java | 9 +-
.../mapreduce/IntegrationTestImportTsv.java | 6 +-
...IntegrationTestTableSnapshotInputFormat.java | 8 +-
.../hadoop/hbase/mttr/IntegrationTestMTTR.java | 6 +-
.../hbase/rsgroup/IntegrationTestRSGroup.java | 6 +-
.../test/IntegrationTestBigLinkedList.java | 15 ++--
...egrationTestBigLinkedListWithVisibility.java | 16 ++--
.../test/IntegrationTestLoadAndVerify.java | 9 +-
.../hbase/test/IntegrationTestReplication.java | 6 +-
...stTimeBoundedRequestsWithRegionReplicas.java | 7 +-
.../test/IntegrationTestZKAndFSPermissions.java | 7 +-
hbase-mapreduce/pom.xml | 4 +-
.../hadoop/hbase/mapred/HRegionPartitioner.java | 15 ++--
.../hbase/mapred/IdentityTableReduce.java | 8 +-
.../hadoop/hbase/mapred/TableInputFormat.java | 6 +-
.../hbase/mapred/TableInputFormatBase.java | 6 +-
.../hbase/mapred/TableRecordReaderImpl.java | 9 +-
.../hadoop/hbase/mapreduce/CellCounter.java | 8 +-
.../hadoop/hbase/mapreduce/CopyTable.java | 6 +-
.../DefaultVisibilityExpressionResolver.java | 7 +-
.../hadoop/hbase/mapreduce/ExportUtils.java | 7 +-
.../hbase/mapreduce/HFileOutputFormat2.java | 6 +-
.../hbase/mapreduce/HRegionPartitioner.java | 13 ++-
.../hadoop/hbase/mapreduce/HashTable.java | 7 +-
.../hbase/mapreduce/IdentityTableReducer.java | 6 +-
.../apache/hadoop/hbase/mapreduce/Import.java | 10 +--
.../hadoop/hbase/mapreduce/ImportTsv.java | 6 +-
.../mapreduce/MultiTableHFileOutputFormat.java | 6 +-
.../mapreduce/MultiTableInputFormatBase.java | 6 +-
.../hbase/mapreduce/MultiTableOutputFormat.java | 6 +-
.../MultiTableSnapshotInputFormatImpl.java | 29 +++----
.../mapreduce/MultithreadedTableMapper.java | 6 +-
.../hadoop/hbase/mapreduce/PutCombiner.java | 6 +-
.../hbase/mapreduce/RegionSizeCalculator.java | 11 +--
.../hbase/mapreduce/ResultSerialization.java | 6 +-
.../hadoop/hbase/mapreduce/RowCounter.java | 6 +-
.../mapreduce/SimpleTotalOrderPartitioner.java | 6 +-
.../hadoop/hbase/mapreduce/SyncTable.java | 7 +-
.../hbase/mapreduce/TableInputFormat.java | 6 +-
.../hbase/mapreduce/TableInputFormatBase.java | 6 +-
.../hbase/mapreduce/TableMapReduceUtil.java | 6 +-
.../hbase/mapreduce/TableOutputFormat.java | 9 +-
.../hbase/mapreduce/TableRecordReaderImpl.java | 9 +-
.../mapreduce/TableSnapshotInputFormatImpl.java | 35 ++++----
.../hadoop/hbase/mapreduce/TableSplit.java | 6 +-
.../hadoop/hbase/mapreduce/WALInputFormat.java | 6 +-
.../hadoop/hbase/mapreduce/WALPlayer.java | 6 +-
.../replication/VerifyReplication.java | 9 +-
.../hbase/regionserver/CompactionTool.java | 6 +-
.../hadoop/hbase/snapshot/ExportSnapshot.java | 9 +-
.../hadoop/hbase/PerformanceEvaluation.java | 12 +--
.../TestMultiTableSnapshotInputFormat.java | 20 +++--
.../hbase/mapred/TestTableInputFormat.java | 6 +-
.../hadoop/hbase/mapred/TestTableMapReduce.java | 10 +--
.../hbase/mapred/TestTableMapReduceUtil.java | 9 +-
.../TestTableOutputFormatConnectionExhaust.java | 8 +-
.../MultiTableInputFormatTestBase.java | 29 +++----
.../TableSnapshotInputFormatTestBase.java | 6 +-
.../hbase/mapreduce/TestHFileOutputFormat2.java | 6 +-
.../hadoop/hbase/mapreduce/TestHashTable.java | 6 +-
.../hbase/mapreduce/TestImportExport.java | 6 +-
.../TestImportTSVWithOperationAttributes.java | 9 +-
.../hbase/mapreduce/TestImportTSVWithTTLs.java | 6 +-
.../TestImportTSVWithVisibilityLabels.java | 7 +-
.../hadoop/hbase/mapreduce/TestImportTsv.java | 6 +-
.../hadoop/hbase/mapreduce/TestJarFinder.java | 4 +-
.../TestMultiTableSnapshotInputFormat.java | 18 ++--
.../mapreduce/TestMultithreadedTableMapper.java | 6 +-
.../hadoop/hbase/mapreduce/TestRowCounter.java | 6 +-
.../hadoop/hbase/mapreduce/TestSyncTable.java | 7 +-
.../hbase/mapreduce/TestTableInputFormat.java | 6 +-
.../mapreduce/TestTableInputFormatScanBase.java | 6 +-
.../hbase/mapreduce/TestTableMapReduce.java | 8 +-
.../hbase/mapreduce/TestTableMapReduceBase.java | 4 +-
.../mapreduce/TestTableSnapshotInputFormat.java | 7 +-
.../hbase/mapreduce/TestTimeRangeMapRed.java | 6 +-
.../hbase/mapreduce/TestWALRecordReader.java | 6 +-
.../replication/TestReplicationSmallTests.java | 7 +-
.../hbase/snapshot/TestExportSnapshot.java | 11 ++-
.../snapshot/TestExportSnapshotNoCluster.java | 6 +-
.../apache/hadoop/hbase/util/LoadTestTool.java | 12 +--
hbase-metrics-api/pom.xml | 4 +-
.../hbase/metrics/MetricRegistriesLoader.java | 6 +-
hbase-procedure/pom.xml | 4 +-
.../procedure2/AbstractProcedureScheduler.java | 6 +-
.../hadoop/hbase/procedure2/Procedure.java | 6 +-
.../hadoop/hbase/procedure2/ProcedureEvent.java | 7 +-
.../hbase/procedure2/ProcedureExecutor.java | 11 +--
.../procedure2/RemoteProcedureDispatcher.java | 6 +-
.../hbase/procedure2/RootProcedureState.java | 6 +-
.../hbase/procedure2/StateMachineProcedure.java | 6 +-
.../procedure2/store/wal/ProcedureWALFile.java | 6 +-
.../store/wal/ProcedureWALFormat.java | 6 +-
.../store/wal/ProcedureWALFormatReader.java | 6 +-
.../procedure2/store/wal/WALProcedureStore.java | 24 +++---
.../procedure2/ProcedureTestingUtility.java | 6 +-
.../hbase/procedure2/TestChildProcedures.java | 6 +-
.../hbase/procedure2/TestProcedureEvents.java | 6 +-
.../procedure2/TestProcedureExecution.java | 17 ++--
.../hbase/procedure2/TestProcedureExecutor.java | 6 +-
.../procedure2/TestProcedureInMemoryChore.java | 6 +-
.../hbase/procedure2/TestProcedureMetrics.java | 6 +-
.../hbase/procedure2/TestProcedureNonce.java | 6 +-
.../hbase/procedure2/TestProcedureRecovery.java | 6 +-
.../procedure2/TestProcedureReplayOrder.java | 6 +-
.../TestProcedureSchedulerConcurrency.java | 6 +-
.../procedure2/TestProcedureSuspended.java | 6 +-
.../procedure2/TestStateMachineProcedure.java | 6 +-
.../hbase/procedure2/TestYieldProcedures.java | 6 +-
.../store/TestProcedureStoreTracker.java | 6 +-
.../store/wal/TestStressWALProcedureStore.java | 6 +-
.../store/wal/TestWALProcedureStore.java | 6 +-
.../hbase/procedure2/util/TestDelayedUtil.java | 6 +-
hbase-protocol-shaded/pom.xml | 1 +
hbase-protocol/pom.xml | 4 +-
.../apache/hadoop/hbase/util/ByteStringer.java | 6 +-
hbase-replication/pom.xml | 4 +-
.../replication/ReplicationPeerZKImpl.java | 11 +--
.../replication/ReplicationPeersZKImpl.java | 6 +-
.../hbase/replication/ReplicationQueueInfo.java | 7 +-
.../ReplicationQueuesClientZKImpl.java | 6 +-
.../replication/ReplicationQueuesZKImpl.java | 6 +-
.../replication/ReplicationTrackerZKImpl.java | 6 +-
.../TableBasedReplicationQueuesImpl.java | 6 +-
hbase-rest/pom.xml | 4 +-
.../hadoop/hbase/rest/MultiRowResource.java | 6 +-
.../hbase/rest/NamespacesInstanceResource.java | 6 +-
.../hadoop/hbase/rest/NamespacesResource.java | 6 +-
.../hbase/rest/ProtobufStreamingOutput.java | 6 +-
.../apache/hadoop/hbase/rest/RESTServer.java | 9 +-
.../apache/hadoop/hbase/rest/RESTServlet.java | 6 +-
.../hadoop/hbase/rest/RegionsResource.java | 6 +-
.../apache/hadoop/hbase/rest/RootResource.java | 7 +-
.../apache/hadoop/hbase/rest/RowResource.java | 6 +-
.../hadoop/hbase/rest/RowResultGenerator.java | 6 +-
.../hbase/rest/ScannerInstanceResource.java | 8 +-
.../hadoop/hbase/rest/ScannerResource.java | 7 +-
.../hbase/rest/ScannerResultGenerator.java | 8 +-
.../hadoop/hbase/rest/SchemaResource.java | 6 +-
.../rest/StorageClusterStatusResource.java | 9 +-
.../rest/StorageClusterVersionResource.java | 9 +-
.../apache/hadoop/hbase/rest/TableResource.java | 13 +--
.../hadoop/hbase/rest/TableScanResource.java | 10 +--
.../hadoop/hbase/rest/VersionResource.java | 7 +-
.../apache/hadoop/hbase/rest/client/Client.java | 6 +-
.../hadoop/hbase/rest/client/RemoteHTable.java | 7 +-
.../hadoop/hbase/rest/client/Response.java | 6 +-
.../hadoop/hbase/rest/filter/AuthFilter.java | 6 +-
.../rest/filter/RestCsrfPreventionFilter.java | 8 +-
.../consumer/ProtobufMessageBodyConsumer.java | 8 +-
.../apache/hadoop/hbase/rest/DummyFilter.java | 6 +-
.../hbase/rest/HBaseRESTTestingUtility.java | 6 +-
.../hbase/rest/PerformanceEvaluation.java | 19 +++--
.../hadoop/hbase/rest/TestScannerResource.java | 12 +--
.../hbase/rest/TestScannersWithFilters.java | 6 +-
.../hadoop/hbase/rest/TestSchemaResource.java | 6 +-
.../hadoop/hbase/rest/TestStatusResource.java | 6 +-
.../hadoop/hbase/rest/TestTableResource.java | 6 +-
.../apache/hadoop/hbase/rest/TestTableScan.java | 6 +-
.../hadoop/hbase/rest/TestVersionResource.java | 6 +-
.../hbase/rest/client/TestXmlParsing.java | 6 +-
.../hbase/rest/model/TestTableSchemaModel.java | 6 +-
hbase-rsgroup/pom.xml | 4 +-
.../hbase/rsgroup/RSGroupAdminEndpoint.java | 7 +-
.../hbase/rsgroup/RSGroupAdminServer.java | 6 +-
.../hbase/rsgroup/RSGroupBasedLoadBalancer.java | 7 +-
.../hbase/rsgroup/RSGroupInfoManagerImpl.java | 11 ++-
.../balancer/TestRSGroupBasedLoadBalancer.java | 7 +-
.../hadoop/hbase/rsgroup/TestRSGroups.java | 7 +-
.../hadoop/hbase/rsgroup/TestRSGroupsBase.java | 7 +-
.../hbase/rsgroup/TestRSGroupsOfflineMode.java | 15 ++--
hbase-server/pom.xml | 9 +-
.../apache/hadoop/hbase/HealthCheckChore.java | 6 +-
.../org/apache/hadoop/hbase/HealthChecker.java | 6 +-
.../org/apache/hadoop/hbase/JMXListener.java | 7 +-
.../apache/hadoop/hbase/LocalHBaseCluster.java | 6 +-
.../apache/hadoop/hbase/ZKNamespaceManager.java | 28 +++----
.../org/apache/hadoop/hbase/ZNodeClearer.java | 6 +-
.../hadoop/hbase/backup/HFileArchiver.java | 7 +-
.../backup/example/HFileArchiveManager.java | 6 +-
.../example/HFileArchiveTableMonitor.java | 6 +-
.../example/LongTermArchivingHFileCleaner.java | 6 +-
.../example/TableHFileArchiveTracker.java | 6 +-
.../hbase/client/ClientSideRegionScanner.java | 6 +-
.../hbase/client/TableSnapshotScanner.java | 6 +-
.../hadoop/hbase/client/locking/EntityLock.java | 6 +-
.../hadoop/hbase/conf/ConfigurationManager.java | 6 +-
.../hbase/constraint/ConstraintProcessor.java | 6 +-
.../hadoop/hbase/constraint/Constraints.java | 6 +-
.../ZKSplitLogManagerCoordination.java | 24 +++---
.../ZkSplitLogWorkerCoordination.java | 11 +--
.../hbase/coprocessor/BaseEnvironment.java | 6 +-
.../hbase/coprocessor/CoprocessorHost.java | 6 +-
.../ForeignExceptionDispatcher.java | 6 +-
.../errorhandling/TimeoutExceptionInjector.java | 6 +-
.../hadoop/hbase/executor/EventHandler.java | 6 +-
.../hadoop/hbase/executor/ExecutorService.java | 6 +-
.../favored/FavoredNodeAssignmentHelper.java | 7 +-
.../hbase/favored/FavoredNodeLoadBalancer.java | 7 +-
.../hbase/favored/FavoredNodesManager.java | 7 +-
.../org/apache/hadoop/hbase/fs/HFileSystem.java | 6 +-
.../hbase/io/FSDataInputStreamWrapper.java | 6 +-
.../org/apache/hadoop/hbase/io/FileLink.java | 6 +-
.../org/apache/hadoop/hbase/io/HFileLink.java | 6 +-
.../hadoop/hbase/io/HalfStoreFileReader.java | 6 +-
.../FanOutOneBlockAsyncDFSOutputHelper.java | 9 +-
.../FanOutOneBlockAsyncDFSOutputSaslHelper.java | 9 +-
.../hadoop/hbase/io/hfile/CacheConfig.java | 6 +-
.../hadoop/hbase/io/hfile/ChecksumUtil.java | 6 +-
.../io/hfile/CompoundBloomFilterWriter.java | 8 +-
.../org/apache/hadoop/hbase/io/hfile/HFile.java | 6 +-
.../hadoop/hbase/io/hfile/HFileBlock.java | 6 +-
.../hadoop/hbase/io/hfile/HFileBlockIndex.java | 6 +-
.../hbase/io/hfile/HFilePrettyPrinter.java | 6 +-
.../hadoop/hbase/io/hfile/HFileReaderImpl.java | 6 +-
.../hadoop/hbase/io/hfile/HFileWriterImpl.java | 6 +-
.../hadoop/hbase/io/hfile/LruBlockCache.java | 6 +-
.../hadoop/hbase/io/hfile/PrefetchExecutor.java | 7 +-
.../hbase/io/hfile/bucket/BucketAllocator.java | 6 +-
.../hbase/io/hfile/bucket/BucketCache.java | 7 +-
.../hbase/io/hfile/bucket/FileIOEngine.java | 7 +-
.../hbase/io/hfile/bucket/FileMmapEngine.java | 6 +-
.../hadoop/hbase/io/util/MemorySizeUtil.java | 6 +-
.../hadoop/hbase/ipc/FifoRpcScheduler.java | 17 ++--
.../apache/hadoop/hbase/ipc/NettyRpcServer.java | 6 +-
.../hadoop/hbase/ipc/RWQueueRpcExecutor.java | 6 +-
.../apache/hadoop/hbase/ipc/RpcExecutor.java | 14 ++--
.../org/apache/hadoop/hbase/ipc/RpcServer.java | 11 +--
.../hadoop/hbase/ipc/RpcServerFactory.java | 6 +-
.../hbase/master/ActiveMasterManager.java | 6 +-
.../master/AssignmentVerificationReport.java | 6 +-
.../hadoop/hbase/master/CatalogJanitor.java | 6 +-
.../apache/hadoop/hbase/master/DeadServer.java | 6 +-
.../hbase/master/DrainingServerTracker.java | 6 +-
.../master/ExpiredMobFileCleanerChore.java | 6 +-
.../org/apache/hadoop/hbase/master/HMaster.java | 21 +++--
.../hadoop/hbase/master/HMasterCommandLine.java | 6 +-
.../hbase/master/MasterCoprocessorHost.java | 7 +-
.../hadoop/hbase/master/MasterFileSystem.java | 14 ++--
.../hbase/master/MasterMetaBootstrap.java | 6 +-
.../hbase/master/MasterMobCompactionThread.java | 6 +-
.../hadoop/hbase/master/MasterRpcServices.java | 7 +-
.../hadoop/hbase/master/MasterWalManager.java | 7 +-
.../hadoop/hbase/master/MetricsMaster.java | 6 +-
.../hadoop/hbase/master/MobCompactionChore.java | 6 +-
.../apache/hadoop/hbase/master/RackManager.java | 6 +-
.../hbase/master/RegionPlacementMaintainer.java | 15 +---
.../hbase/master/RegionServerTracker.java | 6 +-
.../hadoop/hbase/master/ServerManager.java | 7 +-
.../SnapshotOfRegionAssignmentFromMeta.java | 6 +-
.../hadoop/hbase/master/SplitLogManager.java | 10 +--
.../hbase/master/TableNamespaceManager.java | 6 +-
.../hadoop/hbase/master/TableStateManager.java | 7 +-
.../master/assignment/AssignProcedure.java | 7 +-
.../master/assignment/AssignmentManager.java | 10 +--
.../assignment/GCMergedRegionsProcedure.java | 7 +-
.../master/assignment/GCRegionProcedure.java | 7 +-
.../assignment/MergeTableRegionsProcedure.java | 7 +-
.../master/assignment/MoveRegionProcedure.java | 7 +-
.../master/assignment/RegionStateStore.java | 9 +-
.../hbase/master/assignment/RegionStates.java | 7 +-
.../assignment/RegionTransitionProcedure.java | 9 +-
.../assignment/SplitTableRegionProcedure.java | 7 +-
.../master/assignment/UnassignProcedure.java | 7 +-
.../hbase/master/balancer/BalancerChore.java | 6 +-
.../hbase/master/balancer/BaseLoadBalancer.java | 6 +-
.../master/balancer/ClusterStatusChore.java | 6 +-
.../balancer/FavoredStochasticBalancer.java | 7 +-
.../master/balancer/RegionLocationFinder.java | 7 +-
.../master/balancer/SimpleLoadBalancer.java | 7 +-
.../master/balancer/StochasticLoadBalancer.java | 7 +-
.../hbase/master/cleaner/CleanerChore.java | 6 +-
.../hbase/master/cleaner/HFileCleaner.java | 7 +-
.../hbase/master/cleaner/HFileLinkCleaner.java | 7 +-
.../hadoop/hbase/master/cleaner/LogCleaner.java | 7 +-
.../master/cleaner/ReplicationMetaCleaner.java | 6 +-
.../cleaner/ReplicationZKNodeCleaner.java | 6 +-
.../cleaner/ReplicationZKNodeCleanerChore.java | 6 +-
.../master/cleaner/TimeToLiveHFileCleaner.java | 6 +-
.../master/cleaner/TimeToLiveLogCleaner.java | 6 +-
.../cleaner/TimeToLiveProcedureWALCleaner.java | 8 +-
.../hbase/master/locking/LockManager.java | 7 +-
.../hbase/master/locking/LockProcedure.java | 7 +-
.../normalizer/MergeNormalizationPlan.java | 6 +-
.../normalizer/RegionNormalizerChore.java | 6 +-
.../normalizer/SimpleRegionNormalizer.java | 7 +-
.../normalizer/SplitNormalizationPlan.java | 6 +-
.../procedure/CloneSnapshotProcedure.java | 7 +-
.../procedure/CreateNamespaceProcedure.java | 7 +-
.../master/procedure/CreateTableProcedure.java | 7 +-
.../procedure/DeleteNamespaceProcedure.java | 7 +-
.../master/procedure/DeleteTableProcedure.java | 7 +-
.../master/procedure/DisableTableProcedure.java | 7 +-
.../master/procedure/EnableTableProcedure.java | 6 +-
.../procedure/MasterDDLOperationHelper.java | 6 +-
.../master/procedure/MasterProcedureEnv.java | 6 +-
.../procedure/MasterProcedureScheduler.java | 7 +-
.../master/procedure/MasterProcedureUtil.java | 6 +-
.../procedure/ModifyNamespaceProcedure.java | 7 +-
.../master/procedure/ModifyTableProcedure.java | 7 +-
.../master/procedure/ProcedureSyncWait.java | 6 +-
.../master/procedure/RSProcedureDispatcher.java | 7 +-
.../master/procedure/RecoverMetaProcedure.java | 7 +-
.../procedure/RestoreSnapshotProcedure.java | 7 +-
.../master/procedure/ServerCrashProcedure.java | 6 +-
.../procedure/TruncateTableProcedure.java | 7 +-
.../snapshot/DisabledTableSnapshotHandler.java | 7 +-
.../snapshot/EnabledTableSnapshotHandler.java | 7 +-
.../master/snapshot/MasterSnapshotVerifier.java | 7 +-
.../master/snapshot/SnapshotFileCache.java | 15 ++--
.../master/snapshot/SnapshotHFileCleaner.java | 6 +-
.../hbase/master/snapshot/SnapshotManager.java | 7 +-
.../master/snapshot/TakeSnapshotHandler.java | 7 +-
.../hbase/mob/DefaultMobStoreCompactor.java | 6 +-
.../hbase/mob/DefaultMobStoreFlusher.java | 6 +-
.../hadoop/hbase/mob/ExpiredMobFileCleaner.java | 6 +-
.../apache/hadoop/hbase/mob/MobFileCache.java | 6 +-
.../org/apache/hadoop/hbase/mob/MobUtils.java | 6 +-
.../compactions/PartitionedMobCompactor.java | 10 +--
.../hadoop/hbase/monitoring/TaskMonitor.java | 6 +-
.../hbase/namespace/NamespaceAuditor.java | 6 +-
.../hbase/namespace/NamespaceStateManager.java | 6 +-
.../hadoop/hbase/procedure/Procedure.java | 6 +-
.../hbase/procedure/ProcedureCoordinator.java | 6 +-
.../hbase/procedure/ProcedureManagerHost.java | 6 +-
.../hadoop/hbase/procedure/ProcedureMember.java | 6 +-
.../RegionServerProcedureManagerHost.java | 8 +-
.../hadoop/hbase/procedure/Subprocedure.java | 6 +-
.../hbase/procedure/ZKProcedureCoordinator.java | 6 +-
.../hbase/procedure/ZKProcedureMemberRpcs.java | 6 +-
.../hadoop/hbase/procedure/ZKProcedureUtil.java | 6 +-
.../procedure/flush/FlushTableSubprocedure.java | 6 +-
.../flush/MasterFlushTableProcedureManager.java | 7 +-
.../RegionServerFlushTableProcedureManager.java | 7 +-
.../hbase/quotas/DefaultOperationQuota.java | 6 +-
.../quotas/FileSystemUtilizationChore.java | 6 +-
.../hadoop/hbase/quotas/MasterQuotaManager.java | 7 +-
.../apache/hadoop/hbase/quotas/QuotaCache.java | 6 +-
.../hadoop/hbase/quotas/QuotaObserverChore.java | 7 +-
.../apache/hadoop/hbase/quotas/QuotaUtil.java | 6 +-
.../quotas/RegionServerRpcQuotaManager.java | 6 +-
.../quotas/RegionServerSpaceQuotaManager.java | 6 +-
.../quotas/SnapshotQuotaObserverChore.java | 6 +-
.../hbase/quotas/SpaceLimitingException.java | 6 +-
.../hbase/quotas/SpaceQuotaRefresherChore.java | 6 +-
.../hbase/quotas/TableQuotaSnapshotStore.java | 7 +-
.../quotas/TableSpaceQuotaSnapshotNotifier.java | 6 +-
.../DisableTableViolationPolicyEnforcement.java | 7 +-
...esCompactionsViolationPolicyEnforcement.java | 6 +-
.../hbase/regionserver/AbstractMemStore.java | 4 +-
.../regionserver/AbstractMultiFileWriter.java | 6 +-
.../AnnotationReadingPriorityFunction.java | 8 +-
.../regionserver/BusyRegionSplitPolicy.java | 6 +-
.../hadoop/hbase/regionserver/CellFlatMap.java | 6 +-
.../hadoop/hbase/regionserver/ChunkCreator.java | 6 +-
.../hadoop/hbase/regionserver/CompactSplit.java | 7 +-
.../regionserver/CompactedHFilesDischarger.java | 7 +-
.../hbase/regionserver/CompactingMemStore.java | 6 +-
.../hbase/regionserver/CompactionPipeline.java | 6 +-
.../regionserver/CompositeImmutableSegment.java | 5 +-
.../regionserver/DefaultHeapMemoryTuner.java | 6 +-
.../hbase/regionserver/DefaultMemStore.java | 6 +-
.../regionserver/DefaultStoreFileManager.java | 7 +-
.../hbase/regionserver/DefaultStoreFlusher.java | 6 +-
.../DelimitedKeyPrefixRegionSplitPolicy.java | 8 +-
.../regionserver/FlushAllLargeStoresPolicy.java | 6 +-
.../regionserver/FlushLargeStoresPolicy.java | 6 +-
.../hbase/regionserver/FlushPolicyFactory.java | 6 +-
.../hadoop/hbase/regionserver/HMobStore.java | 6 +-
.../hadoop/hbase/regionserver/HRegion.java | 6 +-
.../hbase/regionserver/HRegionFileSystem.java | 9 +-
.../hbase/regionserver/HRegionServer.java | 25 +++---
.../regionserver/HRegionServerCommandLine.java | 7 +-
.../hadoop/hbase/regionserver/HStore.java | 12 +--
.../hadoop/hbase/regionserver/HStoreFile.java | 7 +-
.../hbase/regionserver/HeapMemoryManager.java | 6 +-
...IncreasingToUpperBoundRegionSplitPolicy.java | 7 +-
.../KeyPrefixRegionSplitPolicy.java | 8 +-
.../hadoop/hbase/regionserver/KeyValueHeap.java | 6 +-
.../hadoop/hbase/regionserver/Leases.java | 22 ++---
.../hadoop/hbase/regionserver/LogRoller.java | 7 +-
.../MemStoreCompactionStrategy.java | 6 +-
.../hbase/regionserver/MemStoreCompactor.java | 17 ++--
.../MemStoreCompactorSegmentsIterator.java | 10 +--
.../hbase/regionserver/MemStoreFlusher.java | 6 +-
.../hbase/regionserver/MemStoreLABImpl.java | 7 +-
.../MetricsRegionServerWrapperImpl.java | 6 +-
.../regionserver/MetricsRegionWrapperImpl.java | 6 +-
.../MultiVersionConcurrencyControl.java | 6 +-
.../hbase/regionserver/RSRpcServices.java | 24 +++---
.../regionserver/RegionCoprocessorHost.java | 12 +--
.../RegionServerCoprocessorHost.java | 7 +-
.../regionserver/SecureBulkLoadManager.java | 7 +-
.../hadoop/hbase/regionserver/Segment.java | 8 +-
.../hbase/regionserver/ServerNonceManager.java | 6 +-
.../hadoop/hbase/regionserver/ShutdownHook.java | 13 +--
.../hbase/regionserver/SplitLogWorker.java | 6 +-
.../hadoop/hbase/regionserver/SplitRequest.java | 7 +-
.../hbase/regionserver/StoreFileInfo.java | 6 +-
.../hbase/regionserver/StoreFileReader.java | 7 +-
.../hbase/regionserver/StoreFileWriter.java | 7 +-
.../hadoop/hbase/regionserver/StoreScanner.java | 7 +-
.../hadoop/hbase/regionserver/StoreUtils.java | 6 +-
.../regionserver/StorefileRefresherChore.java | 6 +-
.../regionserver/StripeMultiFileWriter.java | 6 +-
.../hbase/regionserver/StripeStoreConfig.java | 6 +-
.../hbase/regionserver/StripeStoreEngine.java | 6 +-
.../regionserver/StripeStoreFileManager.java | 7 +-
.../hbase/regionserver/StripeStoreFlusher.java | 7 +-
.../AbstractMultiOutputCompactor.java | 6 +-
.../compactions/CompactionConfiguration.java | 8 +-
.../regionserver/compactions/Compactor.java | 7 +-
.../compactions/DateTieredCompactionPolicy.java | 7 +-
.../compactions/DateTieredCompactor.java | 6 +-
.../compactions/DefaultCompactor.java | 7 +-
.../compactions/ExploringCompactionPolicy.java | 6 +-
.../ExponentialCompactionWindowFactory.java | 14 ++--
.../compactions/FIFOCompactionPolicy.java | 6 +-
.../regionserver/compactions/OffPeakHours.java | 6 +-
.../compactions/RatioBasedCompactionPolicy.java | 6 +-
.../compactions/SortedCompactionPolicy.java | 7 +-
.../compactions/StripeCompactionPolicy.java | 7 +-
.../compactions/StripeCompactor.java | 6 +-
.../handler/CloseRegionHandler.java | 7 +-
.../regionserver/handler/OpenRegionHandler.java | 7 +-
.../handler/ParallelSeekHandler.java | 6 +-
.../handler/RegionReplicaFlushHandler.java | 6 +-
.../handler/WALSplitterHandler.java | 6 +-
.../snapshot/FlushSnapshotSubprocedure.java | 6 +-
.../snapshot/RegionServerSnapshotManager.java | 6 +-
.../CompactionThroughputControllerFactory.java | 8 +-
.../FlushThroughputControllerFactory.java | 6 +-
...sureAwareCompactionThroughputController.java | 8 +-
.../PressureAwareFlushThroughputController.java | 7 +-
.../PressureAwareThroughputController.java | 7 +-
.../hbase/regionserver/wal/AbstractFSWAL.java | 12 +--
.../wal/AbstractProtobufLogWriter.java | 6 +-
.../hbase/regionserver/wal/AsyncFSWAL.java | 7 +-
.../wal/AsyncProtobufLogWriter.java | 7 +-
.../hadoop/hbase/regionserver/wal/FSHLog.java | 12 +--
.../hbase/regionserver/wal/MetricsWAL.java | 6 +-
.../regionserver/wal/ProtobufLogReader.java | 6 +-
.../regionserver/wal/ProtobufLogWriter.java | 12 ++-
.../hbase/regionserver/wal/ReaderBase.java | 6 +-
.../wal/SecureProtobufLogReader.java | 6 +-
.../regionserver/wal/SequenceIdAccounting.java | 6 +-
.../regionserver/wal/WALCoprocessorHost.java | 6 +-
.../hadoop/hbase/regionserver/wal/WALUtil.java | 7 +-
.../replication/BaseReplicationEndpoint.java | 6 +-
.../hbase/replication/BulkLoadCellFilter.java | 7 +-
.../replication/HBaseReplicationEndpoint.java | 6 +-
.../NamespaceTableCfWALEntryFilter.java | 6 +-
.../master/ReplicationHFileCleaner.java | 10 +--
.../master/ReplicationLogCleaner.java | 28 +++----
.../master/ReplicationPeerConfigUpgrader.java | 7 +-
.../DefaultSourceFSConfigurationProvider.java | 8 +-
.../regionserver/DumpReplicationQueues.java | 8 +-
.../HBaseInterClusterReplicationEndpoint.java | 10 +--
.../regionserver/HFileReplicator.java | 6 +-
.../replication/regionserver/MetricsSource.java | 6 +-
.../RecoveredReplicationSource.java | 6 +-
.../RecoveredReplicationSourceShipper.java | 7 +-
.../RecoveredReplicationSourceWALReader.java | 8 +-
.../RegionReplicaReplicationEndpoint.java | 11 ++-
.../replication/regionserver/Replication.java | 9 +-
.../regionserver/ReplicationObserver.java | 6 +-
.../regionserver/ReplicationSink.java | 6 +-
.../regionserver/ReplicationSinkManager.java | 15 ++--
.../regionserver/ReplicationSource.java | 6 +-
.../regionserver/ReplicationSourceFactory.java | 6 +-
.../regionserver/ReplicationSourceManager.java | 10 +--
.../regionserver/ReplicationSourceShipper.java | 6 +-
.../ReplicationSourceWALReader.java | 7 +-
.../regionserver/ReplicationSyncUp.java | 6 +-
.../regionserver/WALEntryStream.java | 6 +-
.../hbase/security/HBaseSaslRpcServer.java | 6 +-
.../security/access/AccessControlLists.java | 6 +-
.../hbase/security/access/AccessController.java | 10 +--
.../CoprocessorWhitelistMasterObserver.java | 8 +-
.../hbase/security/access/TableAuthManager.java | 9 +-
.../security/access/ZKPermissionWatcher.java | 6 +-
.../token/AuthenticationTokenSecretManager.java | 6 +-
.../hbase/security/token/FsDelegationToken.java | 6 +-
.../hbase/security/token/TokenProvider.java | 6 +-
.../hadoop/hbase/security/token/TokenUtil.java | 7 +-
.../hbase/security/token/ZKSecretWatcher.java | 29 +++----
.../DefaultVisibilityLabelServiceImpl.java | 10 +--
.../DefinedSetFilterScanLabelGenerator.java | 8 +-
.../visibility/EnforcingScanLabelGenerator.java | 6 +-
.../FeedUserAuthScanLabelGenerator.java | 6 +-
.../visibility/VisibilityController.java | 14 ++--
.../VisibilityLabelServiceManager.java | 6 +-
.../visibility/VisibilityLabelsCache.java | 6 +-
.../VisibilityNewVersionBehaivorTracker.java | 11 ++-
.../VisibilityReplicationEndpoint.java | 9 +-
.../visibility/VisibilityScanDeleteTracker.java | 6 +-
.../security/visibility/VisibilityUtils.java | 6 +-
.../visibility/ZKVisibilityLabelWatcher.java | 6 +-
.../hbase/snapshot/RestoreSnapshotHelper.java | 7 +-
.../snapshot/SnapshotDescriptionUtils.java | 17 ++--
.../hadoop/hbase/snapshot/SnapshotInfo.java | 7 +-
.../hadoop/hbase/snapshot/SnapshotManifest.java | 7 +-
.../hbase/snapshot/SnapshotManifestV1.java | 7 +-
.../hbase/snapshot/SnapshotManifestV2.java | 7 +-
.../hbase/snapshot/SnapshotReferenceUtil.java | 7 +-
.../org/apache/hadoop/hbase/tool/Canary.java | 11 ++-
.../hbase/tool/LoadIncrementalHFiles.java | 10 +--
.../hadoop/hbase/tool/WriteSinkCoprocessor.java | 6 +-
.../hadoop/hbase/util/BloomFilterFactory.java | 8 +-
.../hadoop/hbase/util/CompressionTest.java | 6 +-
.../hadoop/hbase/util/ConnectionCache.java | 6 +-
.../hadoop/hbase/util/DirectMemoryUtils.java | 7 +-
.../hadoop/hbase/util/EncryptionTest.java | 6 +-
.../apache/hadoop/hbase/util/FSHDFSUtils.java | 14 ++--
.../apache/hadoop/hbase/util/FSMapRUtils.java | 6 +-
.../hadoop/hbase/util/FSRegionScanner.java | 7 +-
.../hadoop/hbase/util/FSTableDescriptors.java | 6 +-
.../org/apache/hadoop/hbase/util/FSUtils.java | 6 +-
.../org/apache/hadoop/hbase/util/FSVisitor.java | 6 +-
.../org/apache/hadoop/hbase/util/HBaseFsck.java | 27 +++---
.../hadoop/hbase/util/HBaseFsckRepair.java | 6 +-
.../hadoop/hbase/util/JVMClusterUtil.java | 6 +-
.../hadoop/hbase/util/JvmPauseMonitor.java | 6 +-
.../hadoop/hbase/util/ModifyRegionUtils.java | 6 +-
.../hadoop/hbase/util/MultiHConnection.java | 6 +-
.../apache/hadoop/hbase/util/RegionMover.java | 6 +-
.../hbase/util/RegionSplitCalculator.java | 6 +-
.../hadoop/hbase/util/RegionSplitter.java | 24 ++++--
.../hadoop/hbase/util/ServerCommandLine.java | 6 +-
.../hbase/util/ServerRegionReplicaUtil.java | 6 +-
.../hadoop/hbase/util/ZKDataMigrator.java | 6 +-
.../hbase/util/hbck/HFileCorruptionChecker.java | 6 +-
.../hbase/util/hbck/OfflineMetaRepair.java | 6 +-
.../hadoop/hbase/wal/AbstractFSWALProvider.java | 6 +-
.../hadoop/hbase/wal/AsyncFSWALProvider.java | 7 +-
.../hadoop/hbase/wal/DisabledWALProvider.java | 6 +-
.../apache/hadoop/hbase/wal/FSHLogProvider.java | 6 +-
.../hbase/wal/RegionGroupingProvider.java | 6 +-
.../org/apache/hadoop/hbase/wal/WALEdit.java | 7 +-
.../org/apache/hadoop/hbase/wal/WALFactory.java | 6 +-
.../apache/hadoop/hbase/wal/WALSplitter.java | 9 +-
.../hadoop/hbase/AcidGuaranteesTestTool.java | 7 +-
.../apache/hadoop/hbase/GenericTestUtils.java | 43 +---------
.../org/apache/hadoop/hbase/HBaseCluster.java | 6 +-
.../org/apache/hadoop/hbase/HBaseTestCase.java | 13 +--
.../hadoop/hbase/HBaseTestingUtility.java | 11 ++-
.../hbase/HFilePerformanceEvaluation.java | 8 +-
.../apache/hadoop/hbase/MiniHBaseCluster.java | 7 +-
.../hadoop/hbase/MockRegionServerServices.java | 7 +-
.../hadoop/hbase/MultithreadedTestUtil.java | 8 +-
.../hbase/PerformanceEvaluationCommons.java | 8 +-
.../hadoop/hbase/TestGlobalMemStoreSize.java | 7 +-
.../hadoop/hbase/TestHBaseTestingUtility.java | 6 +-
.../org/apache/hadoop/hbase/TestIOFencing.java | 7 +-
.../hbase/TestIPv6NIOServerSocketChannel.java | 11 ++-
.../apache/hadoop/hbase/TestInfoServers.java | 6 +-
.../hadoop/hbase/TestJMXConnectorServer.java | 6 +-
.../apache/hadoop/hbase/TestJMXListener.java | 6 +-
.../hadoop/hbase/TestMetaTableAccessor.java | 7 +-
.../hbase/TestMetaTableAccessorNoCluster.java | 7 +-
.../hadoop/hbase/TestMetaTableLocator.java | 7 +-
.../hadoop/hbase/TestMovedRegionsCleaner.java | 6 +-
.../apache/hadoop/hbase/TestMultiVersions.java | 6 +-
.../org/apache/hadoop/hbase/TestNamespace.java | 14 ++--
.../hadoop/hbase/TestNodeHealthCheckChore.java | 6 +-
.../hbase/TestPartialResultsFromClientSide.java | 6 +-
.../hadoop/hbase/TestRegionRebalancing.java | 7 +-
.../hbase/TestStochasticBalancerJmxMetrics.java | 6 +-
.../org/apache/hadoop/hbase/TestZooKeeper.java | 6 +-
.../hadoop/hbase/backup/TestHFileArchiving.java | 6 +-
.../TestZooKeeperTableArchiveClient.java | 6 +-
.../apache/hadoop/hbase/client/TestAdmin1.java | 9 +-
.../apache/hadoop/hbase/client/TestAdmin2.java | 7 +-
.../hadoop/hbase/client/TestAsyncAdminBase.java | 6 +-
.../hbase/client/TestAsyncAdminBuilder.java | 6 +-
.../client/TestAsyncNamespaceAdminApi.java | 6 +-
.../hbase/client/TestAsyncQuotaAdminApi.java | 15 ++--
.../hbase/client/TestAsyncRegionAdminApi.java | 2 +-
.../client/TestBlockEvictionFromClient.java | 32 +++----
.../client/TestClientOperationInterrupt.java | 6 +-
.../hadoop/hbase/client/TestClientPushback.java | 6 +-
.../client/TestClientScannerRPCTimeout.java | 15 +---
.../client/TestCloneSnapshotFromClient.java | 6 +-
.../hbase/client/TestDropTimeoutRequest.java | 6 +-
.../hadoop/hbase/client/TestEnableTable.java | 6 +-
.../hadoop/hbase/client/TestFastFail.java | 6 +-
.../hadoop/hbase/client/TestFromClientSide.java | 20 ++---
.../hbase/client/TestFromClientSide3.java | 6 +-
.../hbase/client/TestHBaseAdminNoCluster.java | 6 +-
.../org/apache/hadoop/hbase/client/TestHCM.java | 8 +-
.../hbase/client/TestHTableMultiplexer.java | 6 +-
.../client/TestHTableMultiplexerFlushCache.java | 6 +-
.../client/TestIllegalTableDescriptor.java | 62 ++++----------
.../client/TestIncrementsFromClientSide.java | 6 +-
.../hadoop/hbase/client/TestLeaseRenewal.java | 6 +-
.../hbase/client/TestMetaWithReplicas.java | 6 +-
.../TestMobSnapshotCloneIndependence.java | 6 +-
.../hbase/client/TestMobSnapshotFromClient.java | 6 +-
.../hadoop/hbase/client/TestMultiParallel.java | 10 +--
.../hbase/client/TestMultipleTimestamps.java | 6 +-
.../hbase/client/TestReplicaWithCluster.java | 16 ++--
.../hadoop/hbase/client/TestReplicasClient.java | 17 ++--
.../apache/hadoop/hbase/client/TestResult.java | 6 +-
.../hadoop/hbase/client/TestScannerTimeout.java | 6 +-
.../client/TestScannersFromClientSide.java | 6 +-
.../hadoop/hbase/client/TestSizeFailures.java | 7 +-
.../hbase/client/TestSmallReversedScanner.java | 6 +-
.../client/TestSnapshotCloneIndependence.java | 6 +-
.../hbase/client/TestSnapshotFromClient.java | 6 +-
.../hbase/client/TestSnapshotMetadata.java | 6 +-
.../hbase/client/TestTableFavoredNodes.java | 7 +-
.../hbase/client/TestTableSnapshotScanner.java | 6 +-
.../hbase/client/TestTimestampsFilter.java | 6 +-
.../hbase/client/TestUpdateConfiguration.java | 6 +-
.../hbase/client/locking/TestEntityLocks.java | 6 +-
.../replication/TestReplicationAdmin.java | 8 +-
.../hadoop/hbase/codec/CodecPerformance.java | 6 +-
.../hbase/codec/TestCellMessageCodec.java | 7 +-
.../hbase/conf/TestConfigurationManager.java | 6 +-
.../hadoop/hbase/constraint/TestConstraint.java | 8 +-
.../coprocessor/SampleRegionWALCoprocessor.java | 6 +-
.../coprocessor/TestCoprocessorInterface.java | 6 +-
.../coprocessor/TestCoprocessorMetrics.java | 7 +-
.../hbase/coprocessor/TestCoprocessorStop.java | 8 +-
.../hbase/coprocessor/TestMasterObserver.java | 7 +-
...NegativeMemStoreSizeWithSlowCoprocessor.java | 7 +-
...erverForAddingMutationsFromCoprocessors.java | 8 +-
.../TestRegionObserverInterface.java | 7 +-
...gionServerCoprocessorExceptionWithAbort.java | 6 +-
.../hbase/coprocessor/TestWALObserver.java | 6 +-
.../TestForeignExceptionDispatcher.java | 6 +-
.../TestTimeoutExceptionInjector.java | 6 +-
.../hbase/executor/TestExecutorService.java | 6 +-
.../hbase/filter/FilterTestingCluster.java | 8 --
.../hbase/filter/TestColumnRangeFilter.java | 6 +-
.../hbase/filter/TestDependentColumnFilter.java | 6 +-
.../apache/hadoop/hbase/filter/TestFilter.java | 6 +-
.../hbase/filter/TestFilterListOnMini.java | 6 +-
.../TestFilterListOrOperatorWithBlkCnt.java | 7 +-
.../hbase/filter/TestFilterWithScanLimits.java | 8 +-
.../hadoop/hbase/filter/TestFilterWrapper.java | 6 +-
.../TestFuzzyRowAndColumnRangeFilter.java | 6 +-
.../filter/TestFuzzyRowFilterEndToEnd.java | 6 +-
.../hbase/filter/TestMultiRowRangeFilter.java | 6 +-
.../hadoop/hbase/filter/TestScanRowPrefix.java | 8 +-
.../hadoop/hbase/fs/TestBlockReorder.java | 13 +--
.../apache/hadoop/hbase/io/TestHeapSize.java | 6 +-
.../TestFanOutOneBlockAsyncDFSOutput.java | 7 +-
.../hbase/io/encoding/TestChangingEncoding.java | 6 +-
.../io/encoding/TestDataBlockEncoders.java | 6 +-
.../hbase/io/hfile/TestBlockCacheReporting.java | 16 ++--
.../hadoop/hbase/io/hfile/TestCacheConfig.java | 6 +-
.../hadoop/hbase/io/hfile/TestCacheOnWrite.java | 7 +-
.../hadoop/hbase/io/hfile/TestChecksum.java | 6 +-
.../hbase/io/hfile/TestFixedFileTrailer.java | 6 +-
.../apache/hadoop/hbase/io/hfile/TestHFile.java | 9 +-
.../hadoop/hbase/io/hfile/TestHFileBlock.java | 6 +-
.../hbase/io/hfile/TestHFileBlockIndex.java | 6 +-
.../hbase/io/hfile/TestHFileEncryption.java | 6 +-
.../hadoop/hbase/io/hfile/TestHFileSeek.java | 6 +-
.../hbase/io/hfile/TestHFileWriterV3.java | 6 +-
.../hfile/TestLazyDataBlockDecompression.java | 27 +++---
.../io/hfile/TestScannerFromBucketCache.java | 6 +-
.../io/hfile/TestScannerSelectionUsingTTL.java | 8 +-
.../hfile/TestSeekBeforeWithInlineBlocks.java | 6 +-
.../hadoop/hbase/ipc/AbstractTestIPC.java | 7 +-
.../hadoop/hbase/ipc/TestFifoRpcScheduler.java | 6 +-
.../hadoop/hbase/ipc/TestRpcClientLeaks.java | 6 +-
.../hbase/ipc/TestSimpleRpcScheduler.java | 6 +-
.../hadoop/hbase/master/AbstractTestDLS.java | 7 +-
.../hbase/master/TestActiveMasterManager.java | 8 +-
.../hbase/master/TestAssignmentListener.java | 6 +-
.../master/TestAssignmentManagerMetrics.java | 6 +-
.../hadoop/hbase/master/TestCatalogJanitor.java | 10 +--
.../TestCatalogJanitorInMemoryStates.java | 6 +-
.../hbase/master/TestClockSkewDetection.java | 8 +-
.../hbase/master/TestHMasterRPCException.java | 6 +-
.../apache/hadoop/hbase/master/TestMaster.java | 7 +-
.../hadoop/hbase/master/TestMasterFailover.java | 6 +-
.../hbase/master/TestMasterFileSystem.java | 6 +-
.../hadoop/hbase/master/TestMasterMetrics.java | 6 +-
.../hbase/master/TestMasterMetricsWrapper.java | 6 +-
.../hbase/master/TestMasterNoCluster.java | 6 +-
.../TestMasterOperationsForRegionReplicas.java | 6 +-
.../TestMasterRestartAfterDisablingTable.java | 7 +-
.../hadoop/hbase/master/TestMasterShutdown.java | 6 +-
.../hbase/master/TestMasterTransitions.java | 6 +-
.../hbase/master/TestRegionPlacement.java | 6 +-
.../hbase/master/TestRegionPlacement2.java | 6 +-
.../hadoop/hbase/master/TestRestartCluster.java | 6 +-
.../hadoop/hbase/master/TestRollingRestart.java | 7 +-
.../hbase/master/TestSplitLogManager.java | 14 +---
.../hadoop/hbase/master/TestWarmupRegion.java | 6 +-
.../assignment/AssignmentTestingUtil.java | 6 +-
.../assignment/TestAssignmentManager.java | 19 ++---
.../assignment/TestAssignmentOnRSCrash.java | 6 +-
.../TestMergeTableRegionsProcedure.java | 6 +-
.../master/assignment/TestRegionStates.java | 6 +-
.../assignment/TestRogueRSAssignment.java | 6 +-
.../TestSplitTableRegionProcedure.java | 6 +-
.../hbase/master/balancer/BalancerTestBase.java | 6 +-
.../LoadBalancerPerformanceEvaluation.java | 9 +-
.../master/balancer/TestBaseLoadBalancer.java | 7 +-
.../balancer/TestDefaultLoadBalancer.java | 6 +-
.../balancer/TestFavoredNodeTableImport.java | 6 +-
.../TestFavoredStochasticBalancerPickers.java | 7 +-
.../TestFavoredStochasticLoadBalancer.java | 9 +-
.../balancer/TestRegionsOnMasterOptions.java | 6 +-
.../balancer/TestStochasticLoadBalancer.java | 6 +-
.../balancer/TestStochasticLoadBalancer2.java | 6 +-
.../hbase/master/cleaner/TestCleanerChore.java | 6 +-
.../hbase/master/cleaner/TestHFileCleaner.java | 6 +-
.../hbase/master/cleaner/TestLogsCleaner.java | 6 +-
.../cleaner/TestReplicationHFileCleaner.java | 6 +-
.../master/cleaner/TestSnapshotFromMaster.java | 7 +-
.../hbase/master/locking/TestLockManager.java | 6 +-
.../hbase/master/locking/TestLockProcedure.java | 7 +-
.../normalizer/TestSimpleRegionNormalizer.java | 6 +-
.../TestSimpleRegionNormalizerOnCluster.java | 7 +-
.../MasterProcedureTestingUtility.java | 6 +-
.../procedure/TestCloneSnapshotProcedure.java | 6 +-
.../procedure/TestCreateNamespaceProcedure.java | 6 +-
.../procedure/TestCreateTableProcedure.java | 6 +-
.../procedure/TestDeleteNamespaceProcedure.java | 6 +-
.../procedure/TestDeleteTableProcedure.java | 6 +-
.../procedure/TestDisableTableProcedure.java | 6 +-
.../procedure/TestEnableTableProcedure.java | 6 +-
.../TestMasterFailoverWithProcedures.java | 7 +-
.../procedure/TestMasterProcedureEvents.java | 6 +-
.../procedure/TestMasterProcedureScheduler.java | 7 +-
...TestMasterProcedureSchedulerConcurrency.java | 7 +-
.../procedure/TestMasterProcedureWalLease.java | 6 +-
.../procedure/TestModifyNamespaceProcedure.java | 6 +-
.../master/procedure/TestProcedureAdmin.java | 6 +-
.../procedure/TestRestoreSnapshotProcedure.java | 6 +-
.../procedure/TestSafemodeBringsDownMaster.java | 6 +-
.../procedure/TestServerCrashProcedure.java | 6 +-
.../procedure/TestTableDDLProcedureBase.java | 7 +-
.../procedure/TestTruncateTableProcedure.java | 6 +-
.../procedure/TestWALProcedureStoreOnHDFS.java | 9 +-
.../master/snapshot/TestSnapshotFileCache.java | 7 +-
.../snapshot/TestSnapshotHFileCleaner.java | 6 +-
.../hadoop/hbase/mob/TestCachedMobFile.java | 6 +-
.../apache/hadoop/hbase/mob/TestMobFile.java | 6 +-
.../hadoop/hbase/mob/TestMobFileCache.java | 6 +-
.../hbase/mob/compactions/TestMobCompactor.java | 11 +--
.../TestPartitionedMobCompactor.java | 6 +-
.../hbase/namespace/TestNamespaceAuditor.java | 18 ++--
.../procedure/SimpleMasterProcedureManager.java | 6 +-
.../procedure/SimpleRSProcedureManager.java | 6 +-
.../hbase/procedure/TestProcedureManager.java | 6 +-
.../hadoop/hbase/procedure/TestZKProcedure.java | 7 +-
.../procedure/TestZKProcedureControllers.java | 7 +-
.../hbase/quotas/SpaceQuotaHelperForTests.java | 7 +-
.../SpaceQuotaSnapshotNotifierForTest.java | 7 +-
.../hadoop/hbase/quotas/TestQuotaAdmin.java | 12 +--
.../TestQuotaObserverChoreRegionReports.java | 7 +-
.../TestQuotaObserverChoreWithMiniCluster.java | 8 +-
.../hbase/quotas/TestQuotaStatusRPCs.java | 6 +-
.../hadoop/hbase/quotas/TestQuotaThrottle.java | 14 ++--
.../hadoop/hbase/quotas/TestRegionSizeUse.java | 6 +-
.../quotas/TestSnapshotQuotaObserverChore.java | 7 +-
.../hadoop/hbase/quotas/TestSpaceQuotas.java | 6 +-
.../quotas/TestSpaceQuotasWithSnapshots.java | 7 +-
.../quotas/TestSuperUserQuotaPermissions.java | 6 +-
.../regionserver/CreateRandomStoreFile.java | 16 ++--
.../regionserver/DataBlockEncodingTool.java | 6 +-
.../hbase/regionserver/TestAtomicOperation.java | 17 ++--
.../hbase/regionserver/TestBlocksRead.java | 6 +-
.../regionserver/TestCacheOnWriteInSchema.java | 6 +-
.../hbase/regionserver/TestColumnSeeking.java | 6 +-
.../regionserver/TestCompactSplitThread.java | 7 +-
.../regionserver/TestCompactingMemStore.java | 6 +-
.../TestCompactingToCellFlatMapMemStore.java | 11 ++-
.../TestCompactionFileNotFound.java | 6 +-
.../TestCompactionInDeadRegionServer.java | 6 +-
.../regionserver/TestCompactionPolicy.java | 7 +-
.../hbase/regionserver/TestCompactionState.java | 6 +-
.../regionserver/TestCompoundBloomFilter.java | 6 +-
.../hbase/regionserver/TestDefaultMemStore.java | 14 ++--
.../regionserver/TestEncryptionKeyRotation.java | 6 +-
.../TestEndToEndSplitTransaction.java | 7 +-
.../hbase/regionserver/TestFSErrorsExposed.java | 6 +-
.../regionserver/TestFailedAppendAndSync.java | 6 +-
.../regionserver/TestGetClosestAtOrBefore.java | 19 +++--
.../hbase/regionserver/TestHMobStore.java | 6 +-
.../hadoop/hbase/regionserver/TestHRegion.java | 30 +++----
.../regionserver/TestHRegionFileSystem.java | 6 +-
.../regionserver/TestHRegionOnCluster.java | 6 +-
.../regionserver/TestHRegionReplayEvents.java | 16 ++--
.../regionserver/TestHRegionServerBulkLoad.java | 7 +-
.../TestHRegionServerBulkLoadWithOldClient.java | 12 +--
.../TestHRegionWithInMemoryFlush.java | 7 +-
.../hadoop/hbase/regionserver/TestHStore.java | 7 +-
.../hbase/regionserver/TestHStoreFile.java | 7 +-
.../hbase/regionserver/TestJoinedScanners.java | 6 +-
.../hbase/regionserver/TestMajorCompaction.java | 6 +-
.../regionserver/TestMasterAddressTracker.java | 8 +-
.../hbase/regionserver/TestMinorCompaction.java | 6 +-
.../regionserver/TestMobStoreCompaction.java | 6 +-
.../regionserver/TestMultiColumnScanner.java | 6 +-
.../hbase/regionserver/TestParallelPut.java | 6 +-
.../regionserver/TestPerColumnFamilyFlush.java | 27 +++---
.../TestRSKilledWhenInitializing.java | 8 +-
.../hbase/regionserver/TestRSStatusServlet.java | 7 +-
.../hbase/regionserver/TestRecoveredEdits.java | 6 +-
.../hbase/regionserver/TestRegionIncrement.java | 6 +-
.../TestRegionMergeTransactionOnCluster.java | 14 ++--
.../hbase/regionserver/TestRegionOpen.java | 7 +-
.../regionserver/TestRegionReplicaFailover.java | 15 +---
.../hbase/regionserver/TestRegionReplicas.java | 15 ++--
.../TestRegionReplicasAreDistributed.java | 6 +-
.../TestRegionReplicasWithModifyTable.java | 5 --
.../TestRegionReplicasWithRestartScenarios.java | 8 +-
.../regionserver/TestRegionServerAbort.java | 6 +-
.../regionserver/TestRegionServerHostname.java | 6 +-
.../regionserver/TestRegionServerMetrics.java | 14 +---
.../regionserver/TestRegionServerNoMaster.java | 6 +-
.../TestRegionServerOnlineConfigChange.java | 8 +-
.../TestRegionServerReadRequestMetrics.java | 7 +-
.../TestRegionServerReportForDuty.java | 6 +-
.../regionserver/TestReversibleScanners.java | 7 +-
.../regionserver/TestScanWithBloomError.java | 8 +-
.../hadoop/hbase/regionserver/TestScanner.java | 6 +-
.../TestScannerHeartbeatMessages.java | 6 --
.../TestScannerRetriableFailure.java | 6 +-
.../regionserver/TestSeekOptimizations.java | 8 +-
.../hbase/regionserver/TestSplitLogWorker.java | 14 ++--
.../TestSplitTransactionOnCluster.java | 7 +-
.../regionserver/TestSplitWalDataLoss.java | 6 +-
.../hbase/regionserver/TestStoreScanner.java | 6 +-
.../hbase/regionserver/TestWALLockup.java | 6 +-
.../TestWALMonotonicallyIncreasingSeqId.java | 6 +-
.../hbase/regionserver/TestWideScanner.java | 6 +-
.../TestCompactionScanQueryMatcher.java | 6 +-
.../querymatcher/TestUserScanQueryMatcher.java | 6 +-
.../TestCompactionWithThroughputController.java | 8 +-
.../TestFlushWithThroughputController.java | 7 +-
.../regionserver/wal/AbstractTestFSWAL.java | 6 +-
.../wal/AbstractTestLogRollPeriod.java | 8 +-
.../wal/AbstractTestLogRolling.java | 6 +-
.../regionserver/wal/AbstractTestWALReplay.java | 6 +-
.../hbase/regionserver/wal/TestFSHLog.java | 6 +-
.../regionserver/wal/TestLogRollAbort.java | 9 +-
.../hbase/regionserver/wal/TestLogRolling.java | 9 +-
.../wal/TestLogRollingNoCluster.java | 9 +-
.../replication/TestMasterReplication.java | 6 +-
.../replication/TestMultiSlaveReplication.java | 6 +-
.../replication/TestNamespaceReplication.java | 6 +-
.../replication/TestPerTableCFReplication.java | 6 +-
.../hbase/replication/TestReplicationBase.java | 6 +-
...estReplicationChangingPeerRegionservers.java | 8 +-
.../TestReplicationDisableInactivePeer.java | 8 +-
.../TestReplicationDroppedTables.java | 6 +-
.../replication/TestReplicationEndpoint.java | 6 +-
.../replication/TestReplicationKillRS.java | 6 +-
.../replication/TestReplicationSource.java | 8 +-
.../replication/TestReplicationStateBasic.java | 6 +-
.../replication/TestReplicationStateZKImpl.java | 6 +-
.../replication/TestReplicationStatus.java | 6 +-
.../replication/TestReplicationSyncUpTool.java | 6 +-
.../TestReplicationTrackerZKImpl.java | 6 +-
.../replication/TestReplicationWithTags.java | 6 +-
.../replication/TestSerialReplication.java | 6 +-
.../replication/master/TestTableCFsUpdater.java | 6 +-
.../regionserver/TestGlobalThrottler.java | 6 +-
.../TestRegionReplicaReplicationEndpoint.java | 15 +---
.../regionserver/TestReplicationSink.java | 6 +-
.../TestReplicationSourceManager.java | 12 +--
.../regionserver/TestReplicationThrottler.java | 6 +-
.../regionserver/TestReplicator.java | 6 +-
.../hbase/security/HBaseKerberosUtils.java | 7 +-
.../apache/hadoop/hbase/security/TestUser.java | 7 +-
.../hbase/security/access/SecureTestUtil.java | 7 +-
.../security/access/TestAccessController.java | 16 +---
.../security/access/TestAccessController2.java | 6 +-
.../security/access/TestAccessController3.java | 15 +---
.../access/TestCellACLWithMultipleVersions.java | 70 +++++++---------
.../hbase/security/access/TestCellACLs.java | 16 +---
.../TestCoprocessorWhitelistMasterObserver.java | 7 +-
.../security/access/TestNamespaceCommands.java | 10 +--
.../access/TestScanEarlyTermination.java | 20 ++---
.../security/access/TestTablePermissions.java | 7 +-
.../access/TestWithDisabledAuthorization.java | 27 ++----
.../access/TestZKPermissionWatcher.java | 6 +-
.../security/token/TestTokenAuthentication.java | 19 +++--
.../security/token/TestZKSecretWatcher.java | 6 +-
.../token/TestZKSecretWatcherRefreshKeys.java | 6 +-
.../ExpAsStringVisibilityLabelServiceImpl.java | 10 +--
...sibilityLabelReplicationWithExpAsString.java | 8 +-
.../TestVisibilityLabelsReplication.java | 6 +-
...ibilityLabelsWithDefaultVisLabelService.java | 6 +-
.../TestVisibilityLabelsWithDeletes.java | 6 +-
.../TestWithDisabledAuthorization.java | 21 +++--
.../hbase/snapshot/SnapshotTestingUtils.java | 7 +-
.../snapshot/TestFlushSnapshotFromClient.java | 6 +-
.../TestMobFlushSnapshotFromClient.java | 6 +-
.../TestMobRestoreFlushSnapshotFromClient.java | 6 +-
.../snapshot/TestMobRestoreSnapshotHelper.java | 6 +-
.../hbase/snapshot/TestRegionSnapshotTask.java | 6 +-
.../TestRestoreFlushSnapshotFromClient.java | 7 +-
.../snapshot/TestRestoreSnapshotHelper.java | 6 +-
.../snapshot/TestSnapshotClientRetries.java | 6 +-
.../snapshot/TestSnapshotDescriptionUtils.java | 6 +-
.../hbase/snapshot/TestSnapshotManifest.java | 6 +-
.../TestLoadIncrementalHFilesSplitRecovery.java | 10 +--
.../hadoop/hbase/util/BaseTestHBaseFsck.java | 7 +-
.../hbase/util/HFileArchiveTestingUtil.java | 6 +-
.../apache/hadoop/hbase/util/MockServer.java | 10 +--
.../hadoop/hbase/util/MultiThreadedAction.java | 6 +-
.../hadoop/hbase/util/MultiThreadedReader.java | 13 ++-
.../hbase/util/MultiThreadedReaderWithACL.java | 6 +-
.../hadoop/hbase/util/MultiThreadedUpdater.java | 7 +-
.../hbase/util/MultiThreadedUpdaterWithACL.java | 6 +-
.../hadoop/hbase/util/MultiThreadedWriter.java | 6 +-
.../hbase/util/MultiThreadedWriterBase.java | 6 +-
.../hbase/util/MultiThreadedWriterWithACL.java | 6 +-
.../util/ProcessBasedLocalHBaseCluster.java | 8 +-
.../hadoop/hbase/util/RestartMetaTest.java | 6 +-
.../hadoop/hbase/util/TestCompressionTest.java | 6 +-
.../hadoop/hbase/util/TestFSHDFSUtils.java | 6 +-
.../hbase/util/TestFSTableDescriptors.java | 6 +-
.../apache/hadoop/hbase/util/TestFSUtils.java | 6 +-
.../apache/hadoop/hbase/util/TestFSVisitor.java | 6 +-
.../apache/hadoop/hbase/util/TestIdLock.java | 6 +-
.../hadoop/hbase/util/TestIdReadWriteLock.java | 6 +-
.../hadoop/hbase/util/TestJSONMetricUtil.java | 7 +-
.../util/TestMiniClusterLoadSequential.java | 6 +-
.../hadoop/hbase/util/TestRegionMover.java | 6 +-
.../hbase/util/TestRegionSplitCalculator.java | 6 +-
.../hadoop/hbase/util/TestRegionSplitter.java | 6 +-
.../apache/hadoop/hbase/util/TestRootPath.java | 12 +--
.../util/hbck/OfflineMetaRebuildTestCore.java | 8 +-
.../util/test/LoadTestDataGeneratorWithACL.java | 6 +-
.../apache/hadoop/hbase/wal/IOTestProvider.java | 6 +-
.../wal/TestBoundedRegionGroupingStrategy.java | 7 +-
.../hadoop/hbase/wal/TestFSHLogProvider.java | 6 +-
.../apache/hadoop/hbase/wal/TestSecureWAL.java | 7 --
.../apache/hadoop/hbase/wal/TestWALFactory.java | 14 ++--
.../hbase/wal/TestWALReaderOnSecureWAL.java | 7 --
.../apache/hadoop/hbase/wal/TestWALRootDir.java | 6 +-
.../apache/hadoop/hbase/wal/TestWALSplit.java | 16 ++--
.../hbase/wal/WALPerformanceEvaluation.java | 8 +-
.../hbase/zookeeper/TestZooKeeperACL.java | 6 +-
hbase-shaded/pom.xml | 1 -
hbase-shell/pom.xml | 4 +-
.../hbase/client/rsgroup/TestShellRSGroups.java | 6 +-
hbase-spark-it/pom.xml | 4 +-
.../spark/IntegrationTestSparkBulkLoad.java | 6 +-
.../hbase/spark/SparkSQLPushDownFilter.java | 6 +-
.../hbase/spark/TestJavaHBaseContext.java | 9 +-
hbase-testing-util/pom.xml | 1 -
hbase-thrift/pom.xml | 4 +-
.../apache/hadoop/hbase/thrift/CallQueue.java | 6 +-
.../thrift/HThreadedSelectorServerArgs.java | 6 +-
.../hbase/thrift/HbaseHandlerMetricsProxy.java | 6 +-
.../hadoop/hbase/thrift/IncrementCoalescer.java | 6 +-
.../hbase/thrift/TBoundedThreadPoolServer.java | 7 +-
.../hadoop/hbase/thrift/ThriftHttpServlet.java | 6 +-
.../hadoop/hbase/thrift/ThriftServer.java | 6 +-
.../hadoop/hbase/thrift/ThriftServerRunner.java | 12 +--
.../thrift2/ThriftHBaseServiceHandler.java | 6 +-
.../hadoop/hbase/thrift2/ThriftServer.java | 7 +-
.../hadoop/hbase/thrift/TestCallQueue.java | 6 +-
.../hbase/thrift/TestThriftHttpServer.java | 9 +-
.../hadoop/hbase/thrift/TestThriftServer.java | 6 +-
.../hbase/thrift/TestThriftServerCmdLine.java | 9 +-
.../thrift2/TestThriftHBaseServiceHandler.java | 9 +-
...TestThriftHBaseServiceHandlerWithLabels.java | 8 +-
...stThriftHBaseServiceHandlerWithReadOnly.java | 4 -
hbase-zookeeper/pom.xml | 4 +-
.../hbase/zookeeper/ClusterStatusTracker.java | 6 +-
.../hbase/zookeeper/DeletionListener.java | 6 +-
.../hbase/zookeeper/LoadBalancerTracker.java | 6 +-
.../hbase/zookeeper/MetaTableLocator.java | 7 +-
.../hbase/zookeeper/MiniZooKeeperCluster.java | 6 +-
.../hbase/zookeeper/RecoverableZooKeeper.java | 6 +-
.../zookeeper/RegionNormalizerTracker.java | 6 +-
.../hadoop/hbase/zookeeper/ZKAclReset.java | 6 +-
.../hadoop/hbase/zookeeper/ZKLeaderManager.java | 6 +-
.../hadoop/hbase/zookeeper/ZKNodeTracker.java | 6 +-
.../hadoop/hbase/zookeeper/ZKSplitLog.java | 6 +-
.../apache/hadoop/hbase/zookeeper/ZKUtil.java | 6 +-
.../hadoop/hbase/zookeeper/ZKWatcher.java | 6 +-
.../hbase/zookeeper/TestZKLeaderManager.java | 10 ++-
.../hadoop/hbase/zookeeper/TestZKMulti.java | 6 +-
.../hbase/zookeeper/TestZKNodeTracker.java | 8 +-
pom.xml | 13 ++-
1262 files changed, 4792 insertions(+), 4972 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml
index 616bcad..3cf3c39 100644
--- a/hbase-backup/pom.xml
+++ b/hbase-backup/pom.xml
@@ -123,8 +123,8 @@
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java
index 5f918f3..e853c88 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupDriver.java
@@ -38,20 +38,20 @@ import java.io.IOException;
import java.net.URI;
import org.apache.commons.cli.CommandLine;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.backup.BackupRestoreConstants.BackupCommand;
import org.apache.hadoop.hbase.backup.impl.BackupCommands;
import org.apache.hadoop.hbase.backup.impl.BackupManager;
-import org.apache.yetus.audience.InterfaceAudience;
import org.apache.hadoop.hbase.util.AbstractHBaseTool;
import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.util.ToolRunner;
import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.log4j.LogManager;
+import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -61,7 +61,7 @@ import org.apache.log4j.Logger;
@InterfaceAudience.Private
public class BackupDriver extends AbstractHBaseTool {
- private static final Log LOG = LogFactory.getLog(BackupDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BackupDriver.class);
private CommandLine cmd;
public BackupDriver() throws IOException {
@@ -70,7 +70,7 @@ public class BackupDriver extends AbstractHBaseTool {
protected void init() throws IOException {
// disable irrelevant loggers to avoid it mess up command output
- LogUtils.disableZkAndClientLoggers(LOG);
+ LogUtils.disableZkAndClientLoggers();
}
private int parseAndRun(String[] args) throws IOException {
@@ -122,11 +122,10 @@ public class BackupDriver extends AbstractHBaseTool {
}
// enable debug logging
- Logger backupClientLogger = Logger.getLogger("org.apache.hadoop.hbase.backup");
if (this.cmd.hasOption(OPTION_DEBUG)) {
- backupClientLogger.setLevel(Level.DEBUG);
+ LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.DEBUG);
} else {
- backupClientLogger.setLevel(Level.INFO);
+ LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.INFO);
}
BackupCommands.Command command = BackupCommands.createCommand(getConf(), type, this.cmd);
@@ -157,7 +156,7 @@ public class BackupDriver extends AbstractHBaseTool {
addOptWithArg(OPTION_SET, OPTION_SET_DESC);
addOptWithArg(OPTION_PATH, OPTION_PATH_DESC);
addOptWithArg(OPTION_YARN_QUEUE_NAME, OPTION_YARN_QUEUE_NAME_DESC);
-
+
}
@Override
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java
index c6aa5f0..3825a34 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupHFileCleaner.java
@@ -24,8 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
@@ -34,6 +32,8 @@ import org.apache.hadoop.hbase.HBaseInterfaceAudience;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.master.cleaner.BaseHFileCleanerDelegate;
@@ -49,7 +49,7 @@ import org.apache.hadoop.hbase.shaded.com.google.common.collect.Iterables;
*/
@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)
public class BackupHFileCleaner extends BaseHFileCleanerDelegate implements Abortable {
- private static final Log LOG = LogFactory.getLog(BackupHFileCleaner.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BackupHFileCleaner.class);
private boolean stopped = false;
private boolean aborted;
private Configuration conf;
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java
index 889d223..f6935f8 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupInfo.java
@@ -30,11 +30,11 @@ import java.util.Map.Entry;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.util.BackupUtils;
import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.shaded.protobuf.generated.BackupProtos;
import org.apache.hadoop.hbase.shaded.protobuf.generated.BackupProtos.BackupInfo.Builder;
@@ -46,7 +46,7 @@ import org.apache.hadoop.hbase.util.Bytes;
*/
@InterfaceAudience.Private
public class BackupInfo implements Comparable<BackupInfo> {
- private static final Log LOG = LogFactory.getLog(BackupInfo.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BackupInfo.class);
public static interface Filter {
@@ -425,7 +425,7 @@ public class BackupInfo implements Comparable<BackupInfo> {
try {
return Bytes.equals(toByteArray(), other.toByteArray());
} catch (IOException e) {
- LOG.error(e);
+ LOG.error(e.toString(), e);
return false;
}
} else {
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java
index 1d8f780..191e502 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/BackupObserver.java
@@ -23,8 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseInterfaceAudience;
@@ -40,13 +38,15 @@ import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
import org.apache.hadoop.hbase.coprocessor.RegionObserver;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* An Observer to facilitate backup operations
*/
@InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG)
public class BackupObserver implements RegionCoprocessor, RegionObserver {
- private static final Log LOG = LogFactory.getLog(BackupObserver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BackupObserver.class);
@Override
public Optional<RegionObserver> getRegionObserver() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java
index f5f879a..68dba54 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/HBackupFileSystem.java
@@ -22,8 +22,6 @@ package org.apache.hadoop.hbase.backup;
import java.io.IOException;
import java.util.HashMap;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -31,6 +29,8 @@ import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.TableName;
import org.apache.hadoop.hbase.backup.impl.BackupManifest;
import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* View to an on-disk Backup Image FileSytem Provides the set of methods necessary to interact with
@@ -38,7 +38,7 @@ import org.apache.yetus.audience.InterfaceAudience;
*/
@InterfaceAudience.Private
public class HBackupFileSystem {
- public static final Log LOG = LogFactory.getLog(HBackupFileSystem.class);
+ public static final Logger LOG = LoggerFactory.getLogger(HBackupFileSystem.class);
/**
* This is utility class.
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java
index 3f62338..5ce975f 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java
@@ -17,9 +17,9 @@
*/
package org.apache.hadoop.hbase.backup;
-import org.apache.commons.logging.Log;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.log4j.Level;
+import org.apache.log4j.LogManager;
import org.apache.log4j.Logger;
/**
@@ -34,17 +34,16 @@ final class LogUtils {
/**
* Disables Zk- and HBase client logging
- * @param log
*/
- static void disableZkAndClientLoggers(Log log) {
+ static void disableZkAndClientLoggers() {
// disable zookeeper log to avoid it mess up command output
- Logger zkLogger = Logger.getLogger("org.apache.zookeeper");
+ Logger zkLogger = LogManager.getLogger("org.apache.zookeeper");
zkLogger.setLevel(Level.OFF);
// disable hbase zookeeper tool log to avoid it mess up command output
- Logger hbaseZkLogger = Logger.getLogger("org.apache.hadoop.hbase.zookeeper");
+ Logger hbaseZkLogger = LogManager.getLogger("org.apache.hadoop.hbase.zookeeper");
hbaseZkLogger.setLevel(Level.OFF);
// disable hbase client log to avoid it mess up command output
- Logger hbaseClientLogger = Logger.getLogger("org.apache.hadoop.hbase.client");
+ Logger hbaseClientLogger = LogManager.getLogger("org.apache.hadoop.hbase.client");
hbaseClientLogger.setLevel(Level.OFF);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f572c4b8/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java
----------------------------------------------------------------------
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java
index c8e3474..2903bb0 100644
--- a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java
+++ b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/RestoreDriver.java
@@ -39,8 +39,6 @@ import java.util.List;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseConfiguration;
@@ -50,13 +48,15 @@ import org.apache.hadoop.hbase.backup.impl.BackupManager;
import org.apache.hadoop.hbase.backup.impl.BackupSystemTable;
import org.apache.hadoop.hbase.backup.util.BackupUtils;
import org.apache.yetus.audience.InterfaceAudience;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.apache.hadoop.hbase.client.Connection;
import org.apache.hadoop.hbase.client.ConnectionFactory;
import org.apache.hadoop.hbase.util.AbstractHBaseTool;
import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.util.ToolRunner;
import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.apache.log4j.LogManager;
/**
*
@@ -66,7 +66,7 @@ import org.apache.log4j.Logger;
@InterfaceAudience.Private
public class RestoreDriver extends AbstractHBaseTool {
- private static final Log LOG = LogFactory.getLog(RestoreDriver.class);
+ private static final Logger LOG = LoggerFactory.getLogger(RestoreDriver.class);
private CommandLine cmd;
private static final String USAGE_STRING =
@@ -83,7 +83,7 @@ public class RestoreDriver extends AbstractHBaseTool {
protected void init() throws IOException {
// disable irrelevant loggers to avoid it mess up command output
- LogUtils.disableZkAndClientLoggers(LOG);
+ LogUtils.disableZkAndClientLoggers();
}
private int parseAndRun(String[] args) throws IOException {
@@ -96,9 +96,8 @@ public class RestoreDriver extends AbstractHBaseTool {
System.out.println(BackupRestoreConstants.VERIFY_BACKUP);
// enable debug logging
- Logger backupClientLogger = Logger.getLogger("org.apache.hadoop.hbase.backup");
if (cmd.hasOption(OPTION_DEBUG)) {
- backupClientLogger.setLevel(Level.DEBUG);
+ LogManager.getLogger("org.apache.hadoop.hbase.backup").setLevel(Level.DEBUG);
}
// whether to overwrite to existing table if any, false by default