HBASE-11677 Making Logger instance modifiers consistent. * IA.Public accessible logger instances deprecated * logger instances modified by tests left in place * all others made private static final
Signed-off-by: Sean Busbey <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/94a00bea Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/94a00bea Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/94a00bea Branch: refs/heads/master Commit: 94a00bea07b71f2383805e966748e504b406b95d Parents: 84dd84f Author: Usha Kuchibhotla <[email protected]> Authored: Tue Apr 28 16:54:36 2015 +0530 Committer: Sean Busbey <[email protected]> Committed: Tue Apr 28 09:20:34 2015 -0500 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/client/AsyncProcess.java | 2 +- .../java/org/apache/hadoop/hbase/client/ClientIdGenerator.java | 2 +- .../main/java/org/apache/hadoop/hbase/client/ClientScanner.java | 2 +- .../java/org/apache/hadoop/hbase/client/ClientSmallScanner.java | 2 +- .../apache/hadoop/hbase/client/ConnectionImplementation.java | 2 +- .../hadoop/hbase/client/PreemptiveFastFailInterceptor.java | 2 +- .../org/apache/hadoop/hbase/client/RegionServerCallable.java | 2 +- .../org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java | 1 + .../hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java | 2 +- .../java/org/apache/hadoop/hbase/client/ScannerCallable.java | 1 + .../apache/hadoop/hbase/client/ScannerCallableWithReplicas.java | 2 +- .../java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java | 2 +- .../org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java | 2 +- .../java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java | 3 ++- .../src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java | 4 ++-- .../main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java | 2 +- .../main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java | 5 +++++ .../org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java | 4 ++-- .../java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java | 1 + .../apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java | 2 +- .../apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java | 2 +- .../hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java | 2 +- .../main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java | 4 ++++ .../org/apache/hadoop/hbase/protobuf/ResponseConverter.java | 2 +- .../org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java | 2 +- .../org/apache/hadoop/hbase/security/SaslClientHandler.java | 4 ++-- .../apache/hadoop/hbase/security/access/TablePermission.java | 2 +- .../org/apache/hadoop/hbase/security/access/UserPermission.java | 2 +- .../hbase/security/token/AuthenticationTokenSelector.java | 2 +- .../java/org/apache/hadoop/hbase/security/token/TokenUtil.java | 2 +- .../java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java | 2 +- .../org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java | 3 ++- .../test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestAsyncProcess.java | 3 +++ .../src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ChoreService.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/KeyValue.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ScheduledChore.java | 2 +- .../java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java | 4 ++-- .../java/org/apache/hadoop/hbase/io/compress/Compression.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/ClassSize.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Methods.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Sleeper.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Threads.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestChoreService.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestKeyValue.java | 2 +- .../apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java | 2 +- .../java/org/apache/hadoop/hbase/IntegrationTestIngest.java | 1 + .../hadoop/hbase/IntegrationTestIngestWithEncryption.java | 4 +++- .../org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java | 2 +- .../test/java/org/apache/hadoop/hbase/chaos/actions/Action.java | 2 +- .../hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java | 2 +- .../java/org/apache/hadoop/hbase/chaos/policies/Policy.java | 2 +- .../apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java | 2 +- .../org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java | 2 +- .../java/org/apache/hadoop/hbase/rest/TestStatusResource.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/HealthChecker.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/JMXListener.java | 2 +- .../main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java | 2 +- .../main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java | 2 +- .../java/org/apache/hadoop/hbase/conf/ConfigurationManager.java | 2 +- .../hadoop/hbase/errorhandling/ForeignExceptionDispatcher.java | 2 +- .../main/java/org/apache/hadoop/hbase/http/HttpRequestLog.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/http/HttpServer.java | 2 +- .../java/org/apache/hadoop/hbase/io/HalfStoreFileReader.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/io/hfile/HFile.java | 1 + .../java/org/apache/hadoop/hbase/io/hfile/LruBlockCache.java | 2 +- .../apache/hadoop/hbase/io/hfile/bucket/BucketAllocator.java | 2 +- .../org/apache/hadoop/hbase/io/hfile/bucket/BucketCache.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/ipc/CallRunner.java | 4 ++++ .../src/main/java/org/apache/hadoop/hbase/ipc/RpcServer.java | 1 + .../java/org/apache/hadoop/hbase/ipc/SimpleRpcScheduler.java | 2 +- .../org/apache/hadoop/hbase/mapred/TableRecordReaderImpl.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/HFileOutputFormat.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 2 +- .../hadoop/hbase/mapreduce/MultiTableInputFormatBase.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/TableMapReduceUtil.java | 2 +- .../apache/hadoop/hbase/mapreduce/TableRecordReaderImpl.java | 2 +- .../main/java/org/apache/hadoop/hbase/mapreduce/TableSplit.java | 2 ++ .../main/java/org/apache/hadoop/hbase/mapreduce/WALPlayer.java | 2 +- .../hadoop/hbase/master/AssignmentVerificationReport.java | 2 +- .../java/org/apache/hadoop/hbase/master/MasterRpcServices.java | 2 +- .../main/java/org/apache/hadoop/hbase/master/MetricsMaster.java | 2 +- .../main/java/org/apache/hadoop/hbase/master/RackManager.java | 2 +- .../apache/hadoop/hbase/master/balancer/FavoredNodesPlan.java | 2 +- .../hadoop/hbase/master/balancer/RegionLocationFinder.java | 2 +- .../java/org/apache/hadoop/hbase/master/cleaner/LogCleaner.java | 2 +- .../hadoop/hbase/master/cleaner/TimeToLiveHFileCleaner.java | 2 +- .../hadoop/hbase/master/cleaner/TimeToLiveLogCleaner.java | 2 +- .../org/apache/hadoop/hbase/namespace/NamespaceAuditor.java | 2 +- .../apache/hadoop/hbase/namespace/NamespaceStateManager.java | 2 +- .../hadoop/hbase/procedure/ZKProcedureCoordinatorRpcs.java | 2 +- .../hbase/regionserver/AnnotationReadingPriorityFunction.java | 2 +- .../apache/hadoop/hbase/regionserver/CompactSplitThread.java | 2 +- .../hadoop/hbase/regionserver/DefaultStoreFileManager.java | 2 +- .../main/java/org/apache/hadoop/hbase/regionserver/HRegion.java | 2 +- .../org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java | 2 +- .../org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +- .../main/java/org/apache/hadoop/hbase/regionserver/HStore.java | 2 +- .../regionserver/IncreasingToUpperBoundRegionSplitPolicy.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/LogRoller.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/LruHashMap.java | 2 +- .../org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java | 2 +- .../hbase/regionserver/MetricsRegionServerWrapperImpl.java | 2 +- .../apache/hadoop/hbase/regionserver/RegionMergeRequest.java | 2 +- .../org/apache/hadoop/hbase/regionserver/ScannerContext.java | 4 ++-- .../java/org/apache/hadoop/hbase/regionserver/SplitRequest.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/StoreFile.java | 4 ++-- .../org/apache/hadoop/hbase/regionserver/StoreFileInfo.java | 2 +- .../org/apache/hadoop/hbase/regionserver/StoreFileScanner.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/StoreScanner.java | 2 +- .../org/apache/hadoop/hbase/regionserver/StripeStoreConfig.java | 2 +- .../org/apache/hadoop/hbase/regionserver/StripeStoreEngine.java | 2 +- .../hadoop/hbase/regionserver/StripeStoreFileManager.java | 2 +- .../hbase/regionserver/compactions/CompactionConfiguration.java | 2 +- .../hbase/regionserver/compactions/CompactionRequest.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/wal/HLogKey.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java | 2 +- .../hadoop/hbase/regionserver/wal/MetricsWALEditsReplay.java | 2 +- .../apache/hadoop/hbase/regionserver/wal/ProtobufLogWriter.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/wal/WALEdit.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/wal/WALUtil.java | 2 +- .../hadoop/hbase/replication/regionserver/MetricsSource.java | 2 +- .../hbase/replication/regionserver/ReplicationSource.java | 2 +- .../hbase/replication/regionserver/ReplicationSyncUp.java | 2 +- .../org/apache/hadoop/hbase/security/HBaseSaslRpcServer.java | 2 +- .../apache/hadoop/hbase/security/access/AccessControlLists.java | 2 +- .../apache/hadoop/hbase/security/access/AccessController.java | 2 +- .../security/access/HbaseObjectWritableFor96Migration.java | 2 +- .../hadoop/hbase/security/access/SecureBulkLoadEndpoint.java | 2 +- .../apache/hadoop/hbase/security/access/TableAuthManager.java | 2 +- .../hadoop/hbase/security/access/ZKPermissionWatcher.java | 2 +- .../hbase/security/token/AuthenticationTokenSecretManager.java | 2 +- .../org/apache/hadoop/hbase/security/token/TokenProvider.java | 2 +- .../org/apache/hadoop/hbase/security/token/ZKSecretWatcher.java | 2 +- .../org/apache/hadoop/hbase/snapshot/SnapshotReferenceUtil.java | 2 +- .../org/apache/hadoop/hbase/util/CompoundBloomFilterWriter.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/CompressionTest.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/ConnectionCache.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/EncryptionTest.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/HBaseFsckRepair.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/HMerge.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/util/Merge.java | 2 +- .../org/apache/hadoop/hbase/util/RegionSplitCalculator.java | 2 +- .../main/java/org/apache/hadoop/hbase/util/RegionSplitter.java | 4 ++-- .../src/main/java/org/apache/hadoop/hbase/wal/WALKey.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/wal/WALSplitter.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/HBaseCluster.java | 1 + .../org/apache/hadoop/hbase/HFilePerformanceEvaluation.java | 2 +- .../org/apache/hadoop/hbase/MapFilePerformanceEvaluation.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/MiniHBaseCluster.java | 2 +- .../java/org/apache/hadoop/hbase/MultithreadedTestUtil.java | 2 +- .../java/org/apache/hadoop/hbase/PerformanceEvaluation.java | 2 +- .../org/apache/hadoop/hbase/PerformanceEvaluationCommons.java | 2 +- .../java/org/apache/hadoop/hbase/TestGlobalMemStoreSize.java | 2 +- .../java/org/apache/hadoop/hbase/TestHBaseTestingUtility.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestIOFencing.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestInfoServers.java | 2 +- .../java/org/apache/hadoop/hbase/TestMovedRegionsCleaner.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestNamespace.java | 2 +- .../java/org/apache/hadoop/hbase/TestRegionRebalancing.java | 2 +- .../test/java/org/apache/hadoop/hbase/TestTableDescriptor.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/TestZooKeeper.java | 2 +- .../test/java/org/apache/hadoop/hbase/client/TestAdmin1.java | 2 +- .../test/java/org/apache/hadoop/hbase/client/TestAdmin2.java | 2 +- .../apache/hadoop/hbase/client/TestClientScannerRPCTimeout.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestClientTimeouts.java | 2 +- .../apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java | 2 +- .../test/java/org/apache/hadoop/hbase/client/TestFastFail.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestFromClientSide.java | 2 +- .../org/apache/hadoop/hbase/client/TestFromClientSide3.java | 2 +- .../org/apache/hadoop/hbase/client/TestHTableMultiplexer.java | 2 +- .../hadoop/hbase/client/TestHTableMultiplexerFlushCache.java | 2 +- .../org/apache/hadoop/hbase/client/TestMetaWithReplicas.java | 2 +- .../org/apache/hadoop/hbase/client/TestMultipleTimestamps.java | 2 +- .../hadoop/hbase/client/TestRestoreSnapshotFromClient.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestScannerTimeout.java | 2 +- .../java/org/apache/hadoop/hbase/client/TestSizeFailures.java | 2 +- .../org/apache/hadoop/hbase/client/TestTimestampsFilter.java | 2 +- .../java/org/apache/hadoop/hbase/codec/CodecPerformance.java | 2 ++ .../org/apache/hadoop/hbase/codec/TestCellMessageCodec.java | 2 +- .../org/apache/hadoop/hbase/conf/TestConfigurationManager.java | 2 +- .../hadoop/hbase/coprocessor/ColumnAggregationEndpoint.java | 2 +- .../coprocessor/ColumnAggregationEndpointNullResponse.java | 2 +- .../hbase/coprocessor/ColumnAggregationEndpointWithErrors.java | 2 +- .../apache/hadoop/hbase/coprocessor/SimpleRegionObserver.java | 2 +- .../hadoop/hbase/coprocessor/TestCoprocessorInterface.java | 2 +- .../hadoop/hbase/coprocessor/TestRegionObserverInterface.java | 2 +- .../TestRegionServerCoprocessorExceptionWithAbort.java | 5 +++-- .../hadoop/hbase/coprocessor/TestRowProcessorEndpoint.java | 2 +- .../org/apache/hadoop/hbase/filter/TestColumnRangeFilter.java | 2 +- .../apache/hadoop/hbase/filter/TestDependentColumnFilter.java | 2 +- .../hadoop/hbase/filter/TestFuzzyRowAndColumnRangeFilter.java | 2 +- .../org/apache/hadoop/hbase/filter/TestMultiRowRangeFilter.java | 4 ++-- .../java/org/apache/hadoop/hbase/http/TestGlobalFilter.java | 2 +- .../test/java/org/apache/hadoop/hbase/http/TestHttpServer.java | 2 +- .../test/java/org/apache/hadoop/hbase/http/TestPathFilter.java | 2 +- .../java/org/apache/hadoop/hbase/http/TestServletFilter.java | 2 +- .../org/apache/hadoop/hbase/http/resource/JerseyResource.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java | 2 +- .../test/java/org/apache/hadoop/hbase/io/hfile/TestHFile.java | 2 +- .../org/apache/hadoop/hbase/ipc/TestRpcHandlerException.java | 2 +- .../org/apache/hadoop/hbase/ipc/TestSimpleRpcScheduler.java | 2 +- .../apache/hadoop/hbase/mapreduce/TestHFileOutputFormat.java | 2 +- .../apache/hadoop/hbase/mapreduce/TestHFileOutputFormat2.java | 2 +- .../hbase/mapreduce/TestImportTSVWithOperationAttributes.java | 2 +- .../hbase/mapreduce/TestImportTSVWithVisibilityLabels.java | 2 +- .../java/org/apache/hadoop/hbase/mapreduce/TestImportTsv.java | 2 +- .../hbase/mapreduce/TestLoadIncrementalHFilesSplitRecovery.java | 4 ++-- .../hadoop/hbase/mapreduce/TestMultiTableInputFormat.java | 2 +- .../java/org/apache/hadoop/hbase/mapreduce/TestRowCounter.java | 2 +- .../hadoop/hbase/mapreduce/TestTableInputFormatScanBase.java | 2 +- .../org/apache/hadoop/hbase/mapreduce/TestWALRecordReader.java | 2 +- .../hbase/master/TestMasterOperationsForRegionReplicas.java | 2 +- .../java/org/apache/hadoop/hbase/master/TestMasterShutdown.java | 4 ++-- .../org/apache/hadoop/hbase/master/TestRegionPlacement.java | 2 +- .../org/apache/hadoop/hbase/master/TestRegionPlacement2.java | 2 +- .../java/org/apache/hadoop/hbase/master/TestWarmupRegion.java | 2 +- .../org/apache/hadoop/hbase/procedure/TestProcedureManager.java | 2 +- .../hadoop/hbase/procedure/TestZKProcedureControllers.java | 2 +- .../java/org/apache/hadoop/hbase/quotas/TestQuotaAdmin.java | 4 ++-- .../java/org/apache/hadoop/hbase/quotas/TestQuotaTableUtil.java | 4 ++-- .../apache/hadoop/hbase/regionserver/TestAtomicOperation.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestBlocksRead.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestColumnSeeking.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestCompaction.java | 2 +- .../apache/hadoop/hbase/regionserver/TestCompactionState.java | 2 +- .../apache/hadoop/hbase/regionserver/TestDefaultMemStore.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/TestHRegion.java | 2 +- .../hadoop/hbase/regionserver/TestHRegionReplayEvents.java | 2 +- .../hadoop/hbase/regionserver/TestHRegionServerBulkLoad.java | 2 +- .../apache/hadoop/hbase/regionserver/TestJoinedScanners.java | 2 +- .../apache/hadoop/hbase/regionserver/TestMajorCompaction.java | 2 +- .../apache/hadoop/hbase/regionserver/TestMinorCompaction.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestParallelPut.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/TestScanner.java | 2 +- .../hadoop/hbase/regionserver/TestScannerHeartbeatMessages.java | 2 +- .../java/org/apache/hadoop/hbase/regionserver/TestStore.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestStoreFile.java | 2 +- .../org/apache/hadoop/hbase/regionserver/TestWideScanner.java | 2 +- .../hadoop/hbase/regionserver/wal/SequenceFileLogWriter.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/TestFSHLog.java | 2 +- .../apache/hadoop/hbase/regionserver/wal/TestProtobufLog.java | 2 +- .../hadoop/hbase/regionserver/wal/TestWALActionsListener.java | 2 +- .../org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java | 2 +- .../hadoop/hbase/replication/TestReplicationEndpoint.java | 2 +- .../test/java/org/apache/hadoop/hbase/security/TestUser.java | 2 +- .../hadoop/hbase/security/token/TestTokenAuthentication.java | 4 ++-- .../apache/hadoop/hbase/security/token/TestZKSecretWatcher.java | 2 +- .../TestVisibilityLabelsWithDefaultVisLabelService.java | 3 ++- .../org/apache/hadoop/hbase/snapshot/TestExportSnapshot.java | 2 +- .../hbase/snapshot/TestRestoreFlushSnapshotFromClient.java | 2 +- .../apache/hadoop/hbase/snapshot/TestRestoreSnapshotHelper.java | 2 +- .../src/test/java/org/apache/hadoop/hbase/util/MockServer.java | 2 +- .../java/org/apache/hadoop/hbase/util/TestCompressionTest.java | 2 +- .../org/apache/hadoop/hbase/util/TestCoprocessorScanPolicy.java | 2 +- .../test/java/org/apache/hadoop/hbase/util/TestFSVisitor.java | 2 +- .../test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java | 3 +-- .../test/java/org/apache/hadoop/hbase/util/TestMergeTool.java | 2 +- .../hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java | 2 +- .../hadoop/hbase/util/hbck/TestOfflineMetaRebuildBase.java | 5 ++++- .../hadoop/hbase/util/hbck/TestOfflineMetaRebuildHole.java | 5 ++++- .../hadoop/hbase/util/hbck/TestOfflineMetaRebuildOverlap.java | 5 ++++- .../org/apache/hadoop/hbase/wal/TestDefaultWALProvider.java | 2 +- .../test/java/org/apache/hadoop/hbase/wal/TestSecureWAL.java | 2 +- .../test/java/org/apache/hadoop/hbase/wal/TestWALFactory.java | 2 +- .../org/apache/hadoop/hbase/wal/TestWALReaderOnSecureWAL.java | 2 +- .../org/apache/hadoop/hbase/wal/WALPerformanceEvaluation.java | 2 +- .../org/apache/hadoop/hbase/zookeeper/TestZKLeaderManager.java | 2 +- .../src/main/java/org/apache/hadoop/hbase/thrift/CallQueue.java | 2 +- .../apache/hadoop/hbase/thrift/HbaseHandlerMetricsProxy.java | 2 +- .../java/org/apache/hadoop/hbase/thrift/IncrementCoalescer.java | 2 +- .../java/org/apache/hadoop/hbase/thrift/ThriftHttpServlet.java | 2 +- .../java/org/apache/hadoop/hbase/thrift/ThriftServerRunner.java | 2 +- .../test/java/org/apache/hadoop/hbase/thrift/TestCallQueue.java | 2 +- .../org/apache/hadoop/hbase/thrift/TestThriftHttpServer.java | 2 +- .../org/apache/hadoop/hbase/thrift/TestThriftServerCmdLine.java | 2 +- .../hadoop/hbase/thrift2/TestThriftHBaseServiceHandler.java | 2 +- .../hbase/thrift2/TestThriftHBaseServiceHandlerWithLabels.java | 2 +- 287 files changed, 330 insertions(+), 289 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java index 10f2330..0150a2e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/AsyncProcess.java @@ -96,7 +96,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private class AsyncProcess { - protected static final Log LOG = LogFactory.getLog(AsyncProcess.class); + private static final Log LOG = LogFactory.getLog(AsyncProcess.class); protected static final AtomicLong COUNTER = new AtomicLong(); public static final String PRIMARY_CALL_TIMEOUT_KEY = "hbase.client.primaryCallTimeout.multiget"; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java index 7c859a1..49e1765 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientIdGenerator.java @@ -33,7 +33,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private final class ClientIdGenerator { - static final Log LOG = LogFactory.getLog(ClientIdGenerator.class); + private static final Log LOG = LogFactory.getLog(ClientIdGenerator.class); private ClientIdGenerator() {} http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java index d81a398..01ce47f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientScanner.java @@ -54,7 +54,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public class ClientScanner extends AbstractClientScanner { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ClientScanner.class); // A byte array in which all elements are the max byte, and it is used to // construct closest front row static byte[] MAX_BYTE_ARRAY = Bytes.createMaxByteArray(9); http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java index 77321b0..8e4a0d8 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ClientSmallScanner.java @@ -51,7 +51,7 @@ import com.google.protobuf.ServiceException; */ @InterfaceAudience.Private public class ClientSmallScanner extends ClientScanner { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ClientSmallScanner.class); private ScannerCallableWithReplicas smallScanCallable = null; private SmallScannerCallableFactory callableFactory; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 696a6c9..35ff34f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -98,7 +98,7 @@ import java.util.concurrent.atomic.AtomicInteger; @InterfaceAudience.Private class ConnectionImplementation implements ClusterConnection, Closeable { public static final String RETRIES_BY_SERVER_KEY = "hbase.client.retries.by.server"; - static final Log LOG = LogFactory.getLog(ConnectionImplementation.class); + private static final Log LOG = LogFactory.getLog(ConnectionImplementation.class); private static final String CLIENT_NONCES_ENABLED_KEY = "hbase.client.nonces.enabled"; private final long pause; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java index 6fb2de3..64cd03d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/PreemptiveFastFailInterceptor.java @@ -73,7 +73,7 @@ import org.apache.hadoop.ipc.RemoteException; @InterfaceAudience.Private class PreemptiveFastFailInterceptor extends RetryingCallerInterceptor { - public static final Log LOG = LogFactory + private static final Log LOG = LogFactory .getLog(PreemptiveFastFailInterceptor.class); // amount of time to wait before we consider a server to be in fast fail http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java index 74d699f..9989d56 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RegionServerCallable.java @@ -47,7 +47,7 @@ import org.apache.hadoop.hbase.util.Bytes; @InterfaceAudience.Private public abstract class RegionServerCallable<T> implements RetryingCallable<T> { // Public because used outside of this package over in ipc. - static final Log LOG = LogFactory.getLog(RegionServerCallable.class); + private static final Log LOG = LogFactory.getLog(RegionServerCallable.class); protected final Connection connection; protected final TableName tableName; protected final byte[] row; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java index 03138ec..dd56b17 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerImpl.java @@ -49,6 +49,7 @@ import com.google.protobuf.ServiceException; */ @InterfaceAudience.Private public class RpcRetryingCallerImpl<T> implements RpcRetryingCaller<T> { + // LOG is being used in TestMultiRowRangeFilter, hence leaving it public public static final Log LOG = LogFactory.getLog(RpcRetryingCallerImpl.class); /** * When we started making calls. http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java index 273a1e1..8f28881 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/RpcRetryingCallerWithReadReplicas.java @@ -59,7 +59,7 @@ import com.google.protobuf.ServiceException; */ @InterfaceAudience.Private public class RpcRetryingCallerWithReadReplicas { - static final Log LOG = LogFactory.getLog(RpcRetryingCallerWithReadReplicas.class); + private static final Log LOG = LogFactory.getLog(RpcRetryingCallerWithReadReplicas.class); protected final ExecutorService pool; protected final ClusterConnection cConnection; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java index b53c9d6..6ef4fc4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallable.java @@ -64,6 +64,7 @@ public class ScannerCallable extends RegionServerCallable<Result[]> { = "hbase.client.log.scanner.latency.cutoff"; public static final String LOG_SCANNER_ACTIVITY = "hbase.client.log.scanner.activity"; + // Keeping LOG public as it is being used in TestScannerHeartbeatMessages public static final Log LOG = LogFactory.getLog(ScannerCallable.class); protected long scannerId = -1L; protected boolean instantiated = false; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java index d672852..1708efe 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ScannerCallableWithReplicas.java @@ -60,7 +60,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private class ScannerCallableWithReplicas implements RetryingCallable<Result[]> { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ScannerCallableWithReplicas.class); volatile ScannerCallable currentScannerCallable; AtomicBoolean replicaSwitched = new AtomicBoolean(false); final ClusterConnection cConnection; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java index 8cc7160..5aabb0c 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ZooKeeperRegistry.java @@ -35,7 +35,7 @@ import org.apache.zookeeper.KeeperException; * A cluster registry that stores to zookeeper. */ class ZooKeeperRegistry implements Registry { - static final Log LOG = LogFactory.getLog(ZooKeeperRegistry.class); + private static final Log LOG = LogFactory.getLog(ZooKeeperRegistry.class); // Needs an instance of hci to function. Set after construct this instance. ConnectionImplementation hci; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java index d905868..2fcbf4f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/filter/SingleColumnValueFilter.java @@ -71,7 +71,7 @@ import com.google.protobuf.InvalidProtocolBufferException; @InterfaceAudience.Public @InterfaceStability.Stable public class SingleColumnValueFilter extends FilterBase { - static final Log LOG = LogFactory.getLog(SingleColumnValueFilter.class); + private static final Log LOG = LogFactory.getLog(SingleColumnValueFilter.class); protected byte [] columnFamily; protected byte [] columnQualifier; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java index c3d2624..9be370d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AbstractRpcClient.java @@ -49,6 +49,7 @@ import java.net.SocketAddress; */ @InterfaceAudience.Private public abstract class AbstractRpcClient implements RpcClient { + // Log level is being changed in tests public static final Log LOG = LogFactory.getLog(AbstractRpcClient.class); protected final Configuration conf; @@ -287,4 +288,4 @@ public abstract class AbstractRpcClient implements RpcClient { return this.rpcClient.callBlockingMethod(md, pcrc, param, returnType, this.ticket, this.isa); } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java index 68a494d..ec1909a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncCall.java @@ -39,7 +39,7 @@ import java.io.IOException; */ @InterfaceAudience.Private public class AsyncCall extends DefaultPromise<Message> { - public static final Log LOG = LogFactory.getLog(AsyncCall.class.getName()); + private static final Log LOG = LogFactory.getLog(AsyncCall.class.getName()); final int id; @@ -133,4 +133,4 @@ public class AsyncCall extends DefaultPromise<Message> { public long getRpcTimeout() { return rpcTimeout; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java index 32537fa..cfc8b1b 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcChannel.java @@ -80,7 +80,7 @@ import com.google.protobuf.RpcCallback; */ @InterfaceAudience.Private public class AsyncRpcChannel { - public static final Log LOG = LogFactory.getLog(AsyncRpcChannel.class.getName()); + private static final Log LOG = LogFactory.getLog(AsyncRpcChannel.class.getName()); private static final int MAX_SASL_RETRIES = 5; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java index 26d6f18..2e4d0a6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncRpcClient.java @@ -43,6 +43,9 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicInteger; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.HBaseInterfaceAudience; @@ -68,6 +71,8 @@ import com.google.protobuf.RpcController; @InterfaceAudience.LimitedPrivate(HBaseInterfaceAudience.CONFIG) public class AsyncRpcClient extends AbstractRpcClient { + private static final Log LOG = LogFactory.getLog(AsyncRpcClient.class); + public static final String CLIENT_MAX_THREADS = "hbase.rpc.client.threads.max"; public static final String USE_NATIVE_TRANSPORT = "hbase.rpc.client.nativetransport"; public static final String USE_GLOBAL_EVENT_LOOP_GROUP = "hbase.rpc.client.globaleventloopgroup"; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java index a900140..1404e6f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/AsyncServerResponseHandler.java @@ -38,7 +38,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class AsyncServerResponseHandler extends ChannelInboundHandlerAdapter { - public static final Log LOG = LogFactory.getLog(AsyncServerResponseHandler.class.getName()); + private static final Log LOG = LogFactory.getLog(AsyncServerResponseHandler.class.getName()); private final AsyncRpcChannel channel; @@ -123,4 +123,4 @@ public class AsyncServerResponseHandler extends ChannelInboundHandlerAdapter { e.getPort(), doNotRetry) : new RemoteWithExtrasException(innerExceptionClassName, e.getStackTrace(), doNotRetry); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java index 8ec1517..e60fbd6 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/CoprocessorRpcChannel.java @@ -43,7 +43,7 @@ import com.google.protobuf.ServiceException; @InterfaceAudience.Public @InterfaceStability.Evolving public abstract class CoprocessorRpcChannel implements RpcChannel, BlockingRpcChannel { - private static Log LOG = LogFactory.getLog(CoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(CoprocessorRpcChannel.class); @Override @InterfaceAudience.Private http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java index 7c6c9ba..056ecbc 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/IPCUtil.java @@ -53,6 +53,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class IPCUtil { + // LOG is being used in TestIPCUtil public static final Log LOG = LogFactory.getLog(IPCUtil.class); /** * How much we think the decompressor will expand the original compressed content. http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java index 1bef719..622b5f4 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/MasterCoprocessorRpcChannel.java @@ -43,7 +43,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class MasterCoprocessorRpcChannel extends CoprocessorRpcChannel{ - private static Log LOG = LogFactory.getLog(MasterCoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(MasterCoprocessorRpcChannel.class); private final HConnection connection; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java index 8433cee..092e24d 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionCoprocessorRpcChannel.java @@ -47,7 +47,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class RegionCoprocessorRpcChannel extends CoprocessorRpcChannel{ - private static Log LOG = LogFactory.getLog(RegionCoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(RegionCoprocessorRpcChannel.class); private final HConnection connection; private final TableName table; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java index 027fde4..4d9b9b2 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RegionServerCoprocessorRpcChannel.java @@ -37,7 +37,7 @@ import com.google.protobuf.Message; */ @InterfaceAudience.Private public class RegionServerCoprocessorRpcChannel extends CoprocessorRpcChannel { - private static Log LOG = LogFactory.getLog(RegionServerCoprocessorRpcChannel.class); + private static final Log LOG = LogFactory.getLog(RegionServerCoprocessorRpcChannel.class); private final ClusterConnection connection; private final ServerName serverName; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java index c3bcaf9..9a5fc14 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/RpcClientImpl.java @@ -23,6 +23,9 @@ import com.google.protobuf.Descriptors.MethodDescriptor; import com.google.protobuf.Message; import com.google.protobuf.Message.Builder; import com.google.protobuf.RpcCallback; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.CellScanner; import org.apache.hadoop.hbase.DoNotRetryIOException; @@ -101,6 +104,7 @@ import java.util.concurrent.atomic.AtomicInteger; */ @InterfaceAudience.Private public class RpcClientImpl extends AbstractRpcClient { + private static final Log LOG = LogFactory.getLog(RpcClientImpl.class); protected final AtomicInteger callIdCnt = new AtomicInteger(); protected final PoolMap<ConnectionId, Connection> connections; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java index 65eadde..858cf32 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ResponseConverter.java @@ -63,7 +63,7 @@ import com.google.protobuf.RpcController; */ @InterfaceAudience.Private public final class ResponseConverter { - public static final Log LOG = LogFactory.getLog(ResponseConverter.class); + private static final Log LOG = LogFactory.getLog(ResponseConverter.class); private ResponseConverter() { } http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java index 628ec45..ab3ee0e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/HBaseSaslRpcClient.java @@ -55,7 +55,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public class HBaseSaslRpcClient { - public static final Log LOG = LogFactory.getLog(HBaseSaslRpcClient.class); + private static final Log LOG = LogFactory.getLog(HBaseSaslRpcClient.class); private final SaslClient saslClient; private final boolean fallbackAllowed; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java index 1be59bc..e2c9e02 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/SaslClientHandler.java @@ -48,7 +48,7 @@ import java.util.Random; */ @InterfaceAudience.Private public class SaslClientHandler extends ChannelDuplexHandler { - public static final Log LOG = LogFactory.getLog(SaslClientHandler.class); + private static final Log LOG = LogFactory.getLog(SaslClientHandler.class); private final boolean fallbackAllowed; @@ -375,4 +375,4 @@ public class SaslClientHandler extends ChannelDuplexHandler { */ public void onSuccess(Channel channel); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java index e4758b0..95d962a 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/TablePermission.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private public class TablePermission extends Permission { - private static Log LOG = LogFactory.getLog(TablePermission.class); + private static final Log LOG = LogFactory.getLog(TablePermission.class); private TableName table; private byte[] family; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java index 7313989..09bc33e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/access/UserPermission.java @@ -34,7 +34,7 @@ import org.apache.hadoop.hbase.util.Bytes; */ @InterfaceAudience.Private public class UserPermission extends TablePermission { - private static Log LOG = LogFactory.getLog(UserPermission.class); + private static final Log LOG = LogFactory.getLog(UserPermission.class); private byte[] user; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java index 2ce2919..5b871af 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/AuthenticationTokenSelector.java @@ -31,7 +31,7 @@ import org.apache.hadoop.security.token.TokenSelector; @InterfaceAudience.Private public class AuthenticationTokenSelector implements TokenSelector<AuthenticationTokenIdentifier> { - private static Log LOG = LogFactory.getLog(AuthenticationTokenSelector.class); + private static final Log LOG = LogFactory.getLog(AuthenticationTokenSelector.class); public AuthenticationTokenSelector() { } http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java index 03e657a..9be33d7 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/token/TokenUtil.java @@ -54,7 +54,7 @@ import org.apache.zookeeper.KeeperException; @InterfaceStability.Evolving public class TokenUtil { // This class is referenced indirectly by User out in common; instances are created by reflection - private static Log LOG = LogFactory.getLog(TokenUtil.class); + private static final Log LOG = LogFactory.getLog(TokenUtil.class); /** * Obtain and return an authentication token for the current user. http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java index 495c2bc..6606cf5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKLeaderManager.java @@ -41,7 +41,7 @@ import org.apache.zookeeper.KeeperException; @Deprecated @InterfaceAudience.Private public class ZKLeaderManager extends ZooKeeperListener { - private static Log LOG = LogFactory.getLog(ZKLeaderManager.class); + private static final Log LOG = LogFactory.getLog(ZKLeaderManager.class); private final AtomicBoolean leaderExists = new AtomicBoolean(); private String leaderZNode; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java index 1ed1e3f..262432e 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZooKeeperNodeTracker.java @@ -35,7 +35,8 @@ import org.apache.zookeeper.KeeperException; */ @InterfaceAudience.Private public abstract class ZooKeeperNodeTracker extends ZooKeeperListener { - static final Log LOG = LogFactory.getLog(ZooKeeperNodeTracker.class); + // LOG is being used in subclasses, hence keeping it protected + protected static final Log LOG = LogFactory.getLog(ZooKeeperNodeTracker.class); /** Path of node being tracked */ protected final String node; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java index 43d9411..418afe2 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/TestHTableDescriptor.java @@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category; */ @Category({MiscTests.class, SmallTests.class}) public class TestHTableDescriptor { - final static Log LOG = LogFactory.getLog(TestHTableDescriptor.class); + private static final Log LOG = LogFactory.getLog(TestHTableDescriptor.class); @Test public void testPb() throws DeserializationException, IOException { http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java index 52d66d9..1460de4 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestAsyncProcess.java @@ -39,6 +39,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.HConstants; @@ -65,6 +67,7 @@ import org.mockito.Mockito; @Category({ClientTests.class, MediumTests.class}) public class TestAsyncProcess { + private final static Log LOG = LogFactory.getLog(TestAsyncProcess.class); private static final TableName DUMMY_TABLE = TableName.valueOf("DUMMY_TABLE"); private static final byte[] DUMMY_BYTES_1 = "DUMMY_BYTES_1".getBytes(); http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java index 3eab225..163be70 100644 --- a/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java +++ b/hbase-client/src/test/java/org/apache/hadoop/hbase/ipc/TestIPCUtil.java @@ -51,7 +51,7 @@ import org.junit.experimental.categories.Category; @Category({ClientTests.class, SmallTests.class}) public class TestIPCUtil { - public static final Log LOG = LogFactory.getLog(IPCUtil.class); + private static final Log LOG = LogFactory.getLog(TestIPCUtil.class); IPCUtil util; @Before http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java index 17c75f8..2519f8f 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ChoreService.java @@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class ChoreService implements ChoreServicer { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ChoreService.class); /** * The minimum number of threads in the core pool of the underlying ScheduledThreadPoolExecutor http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java index 7de1f54..9857d8c 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/KeyValue.java @@ -82,7 +82,7 @@ import com.google.common.annotations.VisibleForTesting; public class KeyValue implements Cell, HeapSize, Cloneable, SettableSequenceId, SettableTimestamp { private static final ArrayList<Tag> EMPTY_ARRAY_LIST = new ArrayList<Tag>(); - static final Log LOG = LogFactory.getLog(KeyValue.class); + private static final Log LOG = LogFactory.getLog(KeyValue.class); /** * Colon character in UTF-8 http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java index 8670d60..538b390 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/ScheduledChore.java @@ -42,7 +42,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public abstract class ScheduledChore implements Runnable { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(ScheduledChore.class); private final String name; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java index bff0c77..132abf5 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/BoundedByteBufferPool.java @@ -46,7 +46,7 @@ import com.google.common.annotations.VisibleForTesting; */ @InterfaceAudience.Private public class BoundedByteBufferPool { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(BoundedByteBufferPool.class); @VisibleForTesting final Queue<ByteBuffer> buffers; @@ -110,4 +110,4 @@ public class BoundedByteBufferPool { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java index edb4dfa..821b21f 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/io/compress/Compression.java @@ -47,7 +47,7 @@ import org.apache.hadoop.util.ReflectionUtils; */ @InterfaceAudience.Private public final class Compression { - static final Log LOG = LogFactory.getLog(Compression.class); + private static final Log LOG = LogFactory.getLog(Compression.class); /** * Prevent the instantiation of class. http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java index 3d6d260..2d9027b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ByteBufferArray.java @@ -34,7 +34,7 @@ import org.apache.hadoop.util.StringUtils; */ @InterfaceAudience.Private public final class ByteBufferArray { - static final Log LOG = LogFactory.getLog(ByteBufferArray.class); + private static final Log LOG = LogFactory.getLog(ByteBufferArray.class); static final int DEFAULT_BUFFER_SIZE = 4 * 1024 * 1024; private ByteBuffer buffers[]; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java index 1bb34e1..9f5a88b 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/ClassSize.java @@ -37,7 +37,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class ClassSize { - static final Log LOG = LogFactory.getLog(ClassSize.class); + private static final Log LOG = LogFactory.getLog(ClassSize.class); private static int nrOfRefsPerObj = 2; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java index 9ad73b2..51b1418 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Methods.java @@ -30,7 +30,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; @InterfaceAudience.Private public class Methods { - private static Log LOG = LogFactory.getLog(Methods.class); + private static final Log LOG = LogFactory.getLog(Methods.class); public static <T> Object call(Class<T> clazz, T instance, String methodName, Class[] types, Object[] args) throws Exception { http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java index 4822b0e..4ec0820 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Sleeper.java @@ -31,7 +31,7 @@ import org.apache.hadoop.hbase.classification.InterfaceAudience; */ @InterfaceAudience.Private public class Sleeper { - private final Log LOG = LogFactory.getLog(this.getClass().getName()); + private static final Log LOG = LogFactory.getLog(Sleeper.class); private final int period; private final Stoppable stopper; private static final long MINIMAL_DELTA_FOR_LOGGING = 10000; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java index 51a506b..c366762 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/Threads.java @@ -42,7 +42,7 @@ import com.google.common.base.Preconditions; */ @InterfaceAudience.Private public class Threads { - protected static final Log LOG = LogFactory.getLog(Threads.class); + private static final Log LOG = LogFactory.getLog(Threads.class); private static final AtomicInteger poolNumber = new AtomicInteger(1); private static UncaughtExceptionHandler LOGGING_EXCEPTION_HANDLER = http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java index 1496dc7..14a2cbb 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestChoreService.java @@ -38,7 +38,7 @@ import org.junit.experimental.categories.Category; @Category(SmallTests.class) public class TestChoreService { - private final Log LOG = LogFactory.getLog(this.getClass()); + private static final Log LOG = LogFactory.getLog(TestChoreService.class); /** * A few ScheduledChore samples that are useful for testing with ChoreService http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java index e1de0c3..f1b46c9 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/TestKeyValue.java @@ -42,7 +42,7 @@ import org.apache.hadoop.hbase.util.Bytes; import static org.junit.Assert.assertNotEquals; public class TestKeyValue extends TestCase { - private final Log LOG = LogFactory.getLog(this.getClass().getName()); + private static final Log LOG = LogFactory.getLog(TestKeyValue.class); public void testColumnCompare() throws Exception { final byte [] a = Bytes.toBytes("aaa"); http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java index ddd5d45..6e9816a 100644 --- a/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java +++ b/hbase-common/src/test/java/org/apache/hadoop/hbase/io/crypto/TestKeyStoreKeyProvider.java @@ -41,7 +41,7 @@ import org.junit.experimental.categories.Category; @Category({MiscTests.class, SmallTests.class}) public class TestKeyStoreKeyProvider { - static final Log LOG = LogFactory.getLog(TestKeyStoreKeyProvider.class); + private static final Log LOG = LogFactory.getLog(TestKeyStoreKeyProvider.class); static final HBaseCommonTestingUtility TEST_UTIL = new HBaseCommonTestingUtility(); static final String ALIAS = "test"; static final String PASSWORD = "password"; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java index 8495889..0df4927 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngest.java @@ -61,6 +61,7 @@ public class IntegrationTestIngest extends IntegrationTestBase { protected static final String NUM_READ_THREADS_KEY = "num_read_threads"; protected static final int DEFAULT_NUM_READ_THREADS = 20; + // Log is being used in IntegrationTestIngestWithEncryption, hence it is protected protected static final Log LOG = LogFactory.getLog(IntegrationTestIngest.class); protected IntegrationTestingUtility util; protected HBaseCluster cluster; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java index cd1b0b6..7460b83 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestIngestWithEncryption.java @@ -19,6 +19,8 @@ package org.apache.hadoop.hbase; import java.io.IOException; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Waiter.Predicate; import org.apache.hadoop.hbase.client.Admin; @@ -40,7 +42,7 @@ import org.junit.experimental.categories.Category; @Category(IntegrationTests.class) public class IntegrationTestIngestWithEncryption extends IntegrationTestIngest { - + private final static Log LOG = LogFactory.getLog(IntegrationTestIngestWithEncryption.class); boolean initialized = false; static { http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java index f682ea1..438b174 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestMetaReplicas.java @@ -42,7 +42,7 @@ import org.junit.experimental.categories.Category; */ @Category(IntegrationTests.class) public class IntegrationTestMetaReplicas { - static final Log LOG = LogFactory.getLog(IntegrationTestMetaReplicas.class); + private static final Log LOG = LogFactory.getLog(IntegrationTestMetaReplicas.class); /** * Util to get at the cluster. */ http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java index ebc83ff..a3afccd 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/Action.java @@ -50,7 +50,7 @@ public class Action { public static final String KILL_RS_TIMEOUT_KEY = "hbase.chaosmonkey.action.killrstimeout"; public static final String START_RS_TIMEOUT_KEY = "hbase.chaosmonkey.action.startrstimeout"; - protected static Log LOG = LogFactory.getLog(Action.class); + protected static final Log LOG = LogFactory.getLog(Action.class); protected static final long KILL_MASTER_TIMEOUT_DEFAULT = PolicyBasedChaosMonkey.TIMEOUT; protected static final long START_MASTER_TIMEOUT_DEFAULT = PolicyBasedChaosMonkey.TIMEOUT; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java index 4d0cc6b..d481b58 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/actions/RollingBatchRestartRsAction.java @@ -36,7 +36,7 @@ import org.apache.hadoop.hbase.chaos.monkies.PolicyBasedChaosMonkey; * limits the maximum number of servers that can be down at the same time during rolling restarts. */ public class RollingBatchRestartRsAction extends BatchRestartRsAction { - private static Log LOG = LogFactory.getLog(RollingBatchRestartRsAction.class); + private static final Log LOG = LogFactory.getLog(RollingBatchRestartRsAction.class); protected int maxDeadServers; // number of maximum dead servers at any given time. Defaults to 5 public RollingBatchRestartRsAction(long sleepTime, float ratio) { http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java index affaeda..e60d24e 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/chaos/policies/Policy.java @@ -29,7 +29,7 @@ import org.apache.hadoop.hbase.util.StoppableImplementation; */ public abstract class Policy extends StoppableImplementation implements Runnable { - protected static Log LOG = LogFactory.getLog(Policy.class); + protected static final Log LOG = LogFactory.getLog(Policy.class); protected PolicyContext context; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java ---------------------------------------------------------------------- diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java index 3d72447..4c27ec8 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/mapreduce/IntegrationTestImportTsv.java @@ -63,7 +63,7 @@ import org.junit.experimental.categories.Category; public class IntegrationTestImportTsv implements Configurable, Tool { private static final String NAME = IntegrationTestImportTsv.class.getSimpleName(); - protected static final Log LOG = LogFactory.getLog(IntegrationTestImportTsv.class); + private static final Log LOG = LogFactory.getLog(IntegrationTestImportTsv.class); protected static final String simple_tsv = "row1\t1\tc1\tc2\n" + http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java index 0ecaf5a..1f751a6 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java @@ -36,7 +36,7 @@ import org.apache.log4j.Logger; */ @InterfaceAudience.Private public class RESTServlet implements Constants { - private static Logger LOG = Logger.getLogger(RESTServlet.class); + private static final Logger LOG = Logger.getLogger(RESTServlet.class); private static RESTServlet INSTANCE; private final Configuration conf; private final MetricsREST metrics = new MetricsREST(); http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java index ef53f46..7ad1624 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/DummyFilter.java @@ -32,7 +32,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; public class DummyFilter implements Filter { - private Log LOG = LogFactory.getLog(getClass()); + private static final Log LOG = LogFactory.getLog(DummyFilter.class); @Override public void destroy() { http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java index 8a399e9..628b17c 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/HBaseRESTTestingUtility.java @@ -33,7 +33,7 @@ import com.sun.jersey.spi.container.servlet.ServletContainer; public class HBaseRESTTestingUtility { - static final Log LOG = LogFactory.getLog(HBaseRESTTestingUtility.class); + private static final Log LOG = LogFactory.getLog(HBaseRESTTestingUtility.class); private int testServletPort; private Server server; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java ---------------------------------------------------------------------- diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java index 5fdc631..75ab0fc 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/TestStatusResource.java @@ -47,7 +47,7 @@ import org.junit.experimental.categories.Category; @Category({RestTests.class, MediumTests.class}) public class TestStatusResource { - public static Log LOG = LogFactory.getLog(TestStatusResource.class); + private static final Log LOG = LogFactory.getLog(TestStatusResource.class); private static final byte[] META_REGION_NAME = Bytes.toBytes(TableName.META_TABLE_NAME + ",,1"); http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java index e729ec8..ff9f94b 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthCheckChore.java @@ -29,7 +29,7 @@ import org.apache.hadoop.util.StringUtils; * The Class HealthCheckChore for running health checker regularly. */ public class HealthCheckChore extends ScheduledChore { - private static Log LOG = LogFactory.getLog(HealthCheckChore.class); + private static final Log LOG = LogFactory.getLog(HealthCheckChore.class); private HealthChecker healthChecker; private Configuration config; private int threshold; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java index 687d171..49cc913 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/HealthChecker.java @@ -35,7 +35,7 @@ import org.apache.hadoop.util.Shell.ShellCommandExecutor; */ class HealthChecker { - private static Log LOG = LogFactory.getLog(HealthChecker.class); + private static final Log LOG = LogFactory.getLog(HealthChecker.class); private ShellCommandExecutor shexec = null; private String exceptionStackTrace; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java index 6d22142..0d1c7c4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/JMXListener.java @@ -48,7 +48,7 @@ import javax.rmi.ssl.SslRMIServerSocketFactory; */ public class JMXListener implements Coprocessor { - public static final Log LOG = LogFactory.getLog(JMXListener.class); + private static final Log LOG = LogFactory.getLog(JMXListener.class); public static final String RMI_REGISTRY_PORT_CONF_KEY = ".rmi.registry.port"; public static final String RMI_CONNECTOR_PORT_CONF_KEY = ".rmi.connector.port"; public static final int defMasterRMIRegistryPort = 10101; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java index 1263318..c865360 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/LocalHBaseCluster.java @@ -60,7 +60,7 @@ import org.apache.hadoop.hbase.util.JVMClusterUtil; @InterfaceAudience.Public @InterfaceStability.Evolving public class LocalHBaseCluster { - static final Log LOG = LogFactory.getLog(LocalHBaseCluster.class); + private static final Log LOG = LogFactory.getLog(LocalHBaseCluster.class); private final List<JVMClusterUtil.MasterThread> masterThreads = new CopyOnWriteArrayList<JVMClusterUtil.MasterThread>(); private final List<JVMClusterUtil.RegionServerThread> regionThreads = http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java index d7edf40..7f5faa6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZKNamespaceManager.java @@ -48,7 +48,7 @@ import java.util.concurrent.ConcurrentSkipListMap; */ @InterfaceAudience.Private public class ZKNamespaceManager extends ZooKeeperListener { - private static Log LOG = LogFactory.getLog(ZKNamespaceManager.class); + private static final Log LOG = LogFactory.getLog(ZKNamespaceManager.class); private final String nsZNode; private volatile NavigableMap<String,NamespaceDescriptor> cache; http://git-wip-us.apache.org/repos/asf/hbase/blob/94a00bea/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java index ce32aab..a8b966a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/ZNodeClearer.java @@ -45,7 +45,7 @@ import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; * check its content to make sure that the backup server is not now in charge.</p> */ public class ZNodeClearer { - public static final Log LOG = LogFactory.getLog(ZNodeClearer.class); + private static final Log LOG = LogFactory.getLog(ZNodeClearer.class); private ZNodeClearer() {}
