HDDS-12746. Reduce visibility of Logger members

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientGrpc.java

@@ -659,11 +659,6 @@ public ConfigurationSource getConfig() {
     return config;
   }
 
-  @VisibleForTesting
-  public static Logger getLogger() {
-    return LOG;
-  }
-
   public void setTimeout(long timeout) {
     this.timeout = timeout;
   }

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientRatis.java

@@ -70,7 +70,7 @@
  * The underlying RPC mechanism can be chosen via the constructor.
  */
 public final class XceiverClientRatis extends XceiverClientSpi {
-  public static final Logger LOG = LoggerFactory.getLogger(XceiverClientRatis.class);
+  private static final Logger LOG = LoggerFactory.getLogger(XceiverClientRatis.class);
 
   private final Pipeline pipeline;
   private final RpcType rpcType;

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

@@ -79,7 +79,7 @@
  * through to the container.
  */
 public class BlockDataStreamOutput implements ByteBufferStreamOutput {
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(BlockDataStreamOutput.class);
 
   public static final int PUT_BLOCK_REQUEST_LENGTH_MAX = 1 << 20;  // 1MB

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java

@@ -62,7 +62,7 @@
  */
 public class BlockInputStream extends BlockExtendedInputStream {
 
-  public static final Logger LOG = LoggerFactory.getLogger(BlockInputStream.class);
+  private static final Logger LOG = LoggerFactory.getLogger(BlockInputStream.class);
 
   private static final List<Validator> VALIDATORS =
       ContainerProtocolCalls.toValidatorList((request, response) -> validate(response));

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockOutputStream.java

@@ -84,7 +84,7 @@
  * through to the container.
  */
 public class BlockOutputStream extends OutputStream {
-  public static final Logger LOG =
+  static final Logger LOG =
       LoggerFactory.getLogger(BlockOutputStream.class);
   public static final String EXCEPTION_MSG =
       "Unexpected Storage Container Exception: ";

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BufferPool.java

@@ -42,7 +42,7 @@
  * wait until a allocated buffer is released.
  */
 public class BufferPool {
-  public static final Logger LOG = LoggerFactory.getLogger(BufferPool.class);
+  private static final Logger LOG = LoggerFactory.getLogger(BufferPool.class);
 
   private static final BufferPool EMPTY = new BufferPool(0, 0);
   private final int bufferSize;

hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/TestBlockInputStream.java

@@ -62,6 +62,7 @@
 import org.apache.hadoop.ozone.common.Checksum;
 import org.apache.hadoop.ozone.common.OzoneChecksumException;
 import org.apache.ozone.test.GenericTestUtils;
+import org.apache.ozone.test.GenericTestUtils.LogCapturer;
 import org.apache.ratis.thirdparty.io.grpc.Status;
 import org.apache.ratis.thirdparty.io.grpc.StatusException;
 import org.junit.jupiter.api.BeforeEach;
@@ -266,9 +267,8 @@ public void testSeekAndRead() throws Exception {
 
   @Test
   public void testRefreshPipelineFunction() throws Exception {
-    GenericTestUtils.LogCapturer logCapturer = GenericTestUtils.LogCapturer
-        .captureLogs(BlockInputStream.LOG);
-    GenericTestUtils.setLogLevel(BlockInputStream.LOG, Level.DEBUG);
+    LogCapturer logCapturer = LogCapturer.captureLogs(BlockInputStream.class);
+    GenericTestUtils.setLogLevel(BlockInputStream.class, Level.DEBUG);
     BlockID blockID = new BlockID(new ContainerBlockID(1, 1));
     AtomicBoolean isRefreshed = new AtomicBoolean();
     createChunkList(5);

hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/storage/TestBufferPool.java

@@ -43,7 +43,7 @@ class TestBufferPool {
 
   @BeforeAll
   static void init() {
-    GenericTestUtils.setLogLevel(BufferPool.LOG, Level.DEBUG);
+    GenericTestUtils.setLogLevel(BufferPool.class, Level.DEBUG);
   }
 
   @Test
@@ -67,7 +67,7 @@ private void assertAllocationBlockedUntilReleased(BufferPool pool, Deque<ChunkBu
     // As the pool is full, allocation will need to wait until a buffer is released.
     assertFull(pool);
 
-    LogCapturer logCapturer = LogCapturer.captureLogs(BufferPool.LOG);
+    LogCapturer logCapturer = LogCapturer.captureLogs(BufferPool.class);
     AtomicReference<ChunkBuffer> allocated = new AtomicReference<>();
     AtomicBoolean allocatorStarted = new AtomicBoolean();
     Thread allocator = new Thread(() -> {
@@ -101,7 +101,7 @@ private void assertAllocationBlocked(BufferPool pool) throws Exception {
     // As the pool is full, new allocation will be blocked interruptably if no allocated buffer is released.
     assertFull(pool);
 
-    LogCapturer logCapturer = LogCapturer.captureLogs(BufferPool.LOG);
+    LogCapturer logCapturer = LogCapturer.captureLogs(BufferPool.class);
     AtomicBoolean allocatorStarted = new AtomicBoolean();
     AtomicBoolean interrupted = new AtomicBoolean(false);
     Thread allocator = new Thread(() -> {

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java

@@ -55,7 +55,7 @@ public InnerNodeImpl newInnerNode(String name, String location,
   // number of descendant leaves under this node
   private int numOfLeaves;
   // LOGGER
-  public static final Logger LOG = LoggerFactory.getLogger(InnerNodeImpl.class);
+  private static final Logger LOG = LoggerFactory.getLogger(InnerNodeImpl.class);
 
   /**
    * Construct an InnerNode from its name, network location, parent, level and

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/NetworkTopologyImpl.java

@@ -48,7 +48,7 @@
  * manages traffic in/out of data centers or racks.
  */
 public class NetworkTopologyImpl implements NetworkTopology {
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(NetworkTopologyImpl.class);
 
   /** The Inner node crate factory. */

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/ssl/ReloadingX509KeyManager.java

@@ -49,7 +49,7 @@
 @InterfaceStability.Evolving
 public class ReloadingX509KeyManager extends X509ExtendedKeyManager implements CertificateNotification {
 
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(ReloadingX509KeyManager.class);
 
   private final String type;

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/ssl/ReloadingX509TrustManager.java

@@ -49,7 +49,7 @@
 @InterfaceStability.Evolving
 public final class ReloadingX509TrustManager implements X509TrustManager, CertificateNotification {
 
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(ReloadingX509TrustManager.class);
 
   static final String RELOAD_ERROR_MESSAGE =

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/JsonUtils.java

@@ -47,7 +47,7 @@ public final class JsonUtils {
   private static final ObjectMapper MAPPER;
   private static final ObjectWriter WRITER;
   private static final ObjectMapper INDENT_OUTPUT_MAPPER; // New mapper instance
-  public static final Logger LOG = LoggerFactory.getLogger(JsonUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(JsonUtils.class);
 
   static {
     MAPPER = new ObjectMapper()

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/tracing/StringCodec.java

@@ -32,7 +32,7 @@
  */
 public class StringCodec implements Codec<StringBuilder> {
 
-  public static final Logger LOG  = LoggerFactory.getLogger(StringCodec.class);
+  private static final Logger LOG  = LoggerFactory.getLogger(StringCodec.class);
   public static final StringFormat FORMAT = new StringFormat();
 
   @Override

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/BackgroundService.java

@@ -37,8 +37,7 @@
  */
 public abstract class BackgroundService {
 
-  @VisibleForTesting
-  public static final Logger LOG =
+  protected static final Logger LOG =
       LoggerFactory.getLogger(BackgroundService.class);
 
   // Executor to launch child tasks

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/CodecBuffer.java

@@ -51,7 +51,7 @@
  * for supporting RocksDB direct {@link ByteBuffer} APIs.
  */
 public class CodecBuffer implements UncheckedAutoCloseable {
-  public static final Logger LOG = LoggerFactory.getLogger(CodecBuffer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CodecBuffer.class);
 
   /** To create {@link CodecBuffer} instances. */
   private static class Factory {

hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Checksum.java

@@ -40,7 +40,7 @@
  * This class is not thread safe.
  */
 public class Checksum {
-  public static final Logger LOG = LoggerFactory.getLogger(Checksum.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Checksum.class);
 
   private static Function<ByteBuffer, ByteString> newMessageDigestFunction(
       String algorithm) {

hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumCache.java

@@ -36,7 +36,7 @@
  * For CRC32/CRC32C, each checksum takes 4 bytes. Thus each block chunk has 4 MB / 16 KB * 4 B = 1 KB of checksum data.
  */
 public class ChecksumCache {
-  public static final Logger LOG = LoggerFactory.getLogger(ChecksumCache.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ChecksumCache.class);
 
   private final int bytesPerChecksum;
   private final List<ByteString> checksums;

hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/utils/BufferUtils.java

@@ -31,7 +31,7 @@
  * Utilities for buffers.
  */
 public final class BufferUtils {
-  public static final Logger LOG = LoggerFactory.getLogger(BufferUtils.class);
+  private static final Logger LOG = LoggerFactory.getLogger(BufferUtils.class);
 
   private static final ByteBuffer[] EMPTY_BYTE_BUFFER_ARRAY = {};
 

hadoop-hdds/common/src/test/java/org/apache/hadoop/ozone/common/TestChecksumCache.java

@@ -26,14 +26,11 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Test class for {@link ChecksumCache}.
  */
 class TestChecksumCache {
-  public static final Logger LOG = LoggerFactory.getLogger(TestChecksumCache.class);
 
   @ParameterizedTest
   @EnumSource(ChecksumType.class)

hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/TimeDurationUtil.java

@@ -29,7 +29,7 @@
  */
 public final class TimeDurationUtil {
 
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(TimeDurationUtil.class);
 
   private TimeDurationUtil() {

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/HddsDatanodeService.java

@@ -163,10 +163,6 @@ public static void main(String[] args) {
     }
   }
 
-  public static Logger getLogger() {
-    return LOG;
-  }
-
   @Override
   public Void call() throws Exception {
     OzoneConfiguration configuration = getOzoneConf();

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/DatanodeStateMachine.java

@@ -89,8 +89,7 @@
  * State Machine Class.
  */
 public class DatanodeStateMachine implements Closeable {
-  @VisibleForTesting
-  static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(DatanodeStateMachine.class);
   private final ExecutorService executorService;
   private final ExecutorService pipelineCommandExecutorService;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/DeleteBlocksCommandHandler.java

@@ -78,7 +78,7 @@
  */
 public class DeleteBlocksCommandHandler implements CommandHandler {
 
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(DeleteBlocksCommandHandler.class);
 
   private final ContainerSet containerSet;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java

@@ -68,8 +68,7 @@
  */
 public class HeartbeatEndpointTask
     implements Callable<EndpointStateMachine.EndPointStates> {
-  public static final Logger LOG =
-      LoggerFactory.getLogger(HeartbeatEndpointTask.class);
+  private static final Logger LOG = LoggerFactory.getLogger(HeartbeatEndpointTask.class);
   private final EndpointStateMachine rpcEndpoint;
   private DatanodeDetailsProto datanodeDetailsProto;
   private StateContext context;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/VersionEndpointTask.java

@@ -39,8 +39,7 @@
  */
 public class VersionEndpointTask implements
     Callable<EndpointStateMachine.EndPointStates> {
-  public static final Logger LOG = LoggerFactory.getLogger(VersionEndpointTask
-      .class);
+  private static final Logger LOG = LoggerFactory.getLogger(VersionEndpointTask.class);
   private final EndpointStateMachine rpcEndPoint;
   private final ConfigurationSource configuration;
   private final OzoneContainer ozoneContainer;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/CapacityVolumeChoosingPolicy.java

@@ -41,7 +41,7 @@
  */
 public class CapacityVolumeChoosingPolicy implements VolumeChoosingPolicy {
 
-  public static final Logger LOG = LoggerFactory.getLogger(
+  private static final Logger LOG = LoggerFactory.getLogger(
       CapacityVolumeChoosingPolicy.class);
 
   // Stores the index of the next volume to be returned.

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/RoundRobinVolumeChoosingPolicy.java

@@ -34,7 +34,7 @@
  */
 public class RoundRobinVolumeChoosingPolicy implements VolumeChoosingPolicy {
 
-  public static final Logger LOG = LoggerFactory.getLogger(
+  private static final Logger LOG = LoggerFactory.getLogger(
       RoundRobinVolumeChoosingPolicy.class);
 
   // Stores the index of the next volume to be returned.

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/StorageVolumeChecker.java

@@ -60,7 +60,7 @@ public class StorageVolumeChecker {
 
   public static final int MAX_VOLUME_FAILURE_TOLERATED_LIMIT = -1;
 
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(StorageVolumeChecker.class);
 
   private AsyncChecker<Boolean, VolumeCheckResult> delegateChecker;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/ThrottledAsyncChecker.java

@@ -54,7 +54,7 @@
 @InterfaceAudience.Private
 @InterfaceStability.Unstable
 public class ThrottledAsyncChecker<K, V> implements AsyncChecker<K, V> {
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(ThrottledAsyncChecker.class);
 
   private final Timer timer;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerMetadataInspector.java

@@ -74,7 +74,7 @@
  * log4j.appender.inspectorAppender.layout=org.apache.log4j.PatternLayout
  */
 public class KeyValueContainerMetadataInspector implements ContainerInspector {
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(KeyValueContainerMetadataInspector.class);
   public static final Logger REPORT_LOG = LoggerFactory.getLogger(
       "ContainerMetadataInspectorReport");

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java

@@ -136,7 +136,7 @@
  */
 public class KeyValueHandler extends Handler {
 
-  public static final Logger LOG = LoggerFactory.getLogger(
+  private static final Logger LOG = LoggerFactory.getLogger(
       KeyValueHandler.class);
 
   private final BlockManager blockManager;
@@ -1579,10 +1579,6 @@ private ContainerCommandResponseProto checkFaultInjector(ContainerCommandRequest
     return null;
   }
 
-  public static Logger getLogger() {
-    return LOG;
-  }
-
   @VisibleForTesting
   public static FaultInjector getInjector() {
     return injector;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/BlockManagerImpl.java

@@ -49,7 +49,7 @@
  */
 public class BlockManagerImpl implements BlockManager {
 
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(BlockManagerImpl.class);
 
   private ConfigurationSource config;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/KeyValueStreamDataChannel.java

@@ -37,7 +37,7 @@
  * This class is used to get the DataChannel for streaming.
  */
 public class KeyValueStreamDataChannel extends StreamDataChannelBase {
-  public static final Logger LOG =
+  static final Logger LOG =
       LoggerFactory.getLogger(KeyValueStreamDataChannel.class);
 
   interface WriteMethod {

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java

@@ -57,7 +57,7 @@ public class AbstractDatanodeStore extends AbstractRDBStore<AbstractDatanodeDBDe
 
   private Table<String, Long> finalizeBlocksTableWithIterator;
 
-  public static final Logger LOG =
+  protected static final Logger LOG =
       LoggerFactory.getLogger(AbstractDatanodeStore.class);
 
   /**

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/AbstractBackgroundContainerScanner.java

@@ -30,7 +30,7 @@
  * Base class for scheduled scanners on a Datanode.
  */
 public abstract class AbstractBackgroundContainerScanner implements Runnable {
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(AbstractBackgroundContainerScanner.class);
 
   private final long dataScanInterval;

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/BackgroundContainerDataScanner.java

@@ -39,7 +39,7 @@
  */
 public class BackgroundContainerDataScanner extends
     AbstractBackgroundContainerScanner {
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(BackgroundContainerDataScanner.class);
 
   /**

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/BackgroundContainerMetadataScanner.java

@@ -34,7 +34,7 @@
  */
 public class BackgroundContainerMetadataScanner extends
     AbstractBackgroundContainerScanner {
-  public static final Logger LOG =
+  private static final Logger LOG =
       LoggerFactory.getLogger(BackgroundContainerMetadataScanner.class);
 
   private final ContainerMetadataScannerMetrics metrics;