HDFS-7978. Add LOG.isDebugEnabled() guard for some LOG.debug(..). Contributed by Walter Su.

hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt

@@ -373,6 +373,9 @@ Release 2.8.0 - UNRELEASED
 
     HDFS-8009. Signal congestion on the DataNode. (wheat9)
 
+    HDFS-7978. Add LOG.isDebugEnabled() guard for some LOG.debug(..).
+    (Walter Su via wang)
+
   OPTIMIZATIONS
 
   BUG FIXES

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/BlockReaderFactory.java

@@ -369,9 +369,9 @@ public class BlockReaderFactory implements ShortCircuitReplicaCreator {
       return null;
     }
     if (clientContext.getDisableLegacyBlockReaderLocal()) {
-      PerformanceAdvisory.LOG.debug(this + ": can't construct " +
+        PerformanceAdvisory.LOG.debug("{}: can't construct " +
             "BlockReaderLocalLegacy because " +
-          "disableLegacyBlockReaderLocal is set.");
+            "disableLegacyBlockReaderLocal is set.", this);
       return null;
     }
     IOException ioe = null;
@@ -410,8 +410,8 @@ public class BlockReaderFactory implements ShortCircuitReplicaCreator {
                       getPathInfo(inetSocketAddress, conf);
     }
     if (!pathInfo.getPathState().getUsableForShortCircuit()) {
-      PerformanceAdvisory.LOG.debug(this + ": " + pathInfo + " is not " +
+      PerformanceAdvisory.LOG.debug("{}: {} is not usable for short circuit; " +
-          "usable for short circuit; giving up on BlockReaderLocal.");
+              "giving up on BlockReaderLocal.", this, pathInfo);
       return null;
     }
     ShortCircuitCache cache = clientContext.getShortCircuitCache();
@@ -426,11 +426,9 @@ public class BlockReaderFactory implements ShortCircuitReplicaCreator {
       throw exc;
     }
     if (info.getReplica() == null) {
-      if (LOG.isTraceEnabled()) {
+      PerformanceAdvisory.LOG.debug("{}: failed to get " +
-        PerformanceAdvisory.LOG.debug(this + ": failed to get " +
           "ShortCircuitReplica. Cannot construct " +
-            "BlockReaderLocal via " + pathInfo.getPath());
+          "BlockReaderLocal via {}", this, pathInfo.getPath());
-      }
       return null;
     }
     return new BlockReaderLocal.Builder(conf).
@@ -610,9 +608,9 @@ public class BlockReaderFactory implements ShortCircuitReplicaCreator {
                       getPathInfo(inetSocketAddress, conf);
     }
     if (!pathInfo.getPathState().getUsableForDataTransfer()) {
-      PerformanceAdvisory.LOG.debug(this + ": not trying to create a " +
+      PerformanceAdvisory.LOG.debug("{}: not trying to create a " +
-          "remote block reader because the UNIX domain socket at " +
+          "remote block reader because the UNIX domain socket at {}" +
-          pathInfo + " is not usable.");
+           " is not usable.", this, pathInfo);
       return null;
     }
     if (LOG.isTraceEnabled()) {

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/HAUtil.java

@@ -319,14 +319,18 @@ public class HAUtil {
             buildTokenServicePrefixForLogicalUri(HdfsConstants.HDFS_URI_SCHEME)
                 + "//" + specificToken.getService());
         ugi.addToken(alias, specificToken);
+        if (LOG.isDebugEnabled()) {
           LOG.debug("Mapped HA service delegation token for logical URI " +
               haUri + " to namenode " + singleNNAddr);
         }
+      }
     } else {
+      if (LOG.isDebugEnabled()) {
         LOG.debug("No HA service delegation token found for logical URI " +
             haUri);
       }
     }
+  }
 
   /**
    * Get the internet address of the currently-active NN. This should rarely be

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/BPServiceActor.java

@@ -580,10 +580,12 @@ class BPServiceActor implements Runnable {
       long createCost = createTime - startTime;
       long sendCost = sendTime - createTime;
       dn.getMetrics().addCacheReport(sendCost);
+      if (LOG.isDebugEnabled()) {
         LOG.debug("CacheReport of " + blockIds.size()
             + " block(s) took " + createCost + " msec to generate and "
             + sendCost + " msecs for RPC and NN processing");
       }
+    }
     return cmd;
   }
   

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetCache.java

@@ -319,9 +319,11 @@ public class FsDatasetCache {
       mappableBlockMap.put(key,
           new Value(prevValue.mappableBlock, State.UNCACHING));
       if (deferred) {
+        if (LOG.isDebugEnabled()) {
           LOG.debug("{} is anchored, and can't be uncached now.  Scheduling it " +
                   "for uncaching in {} ",
               key, DurationFormatUtils.formatDurationHMS(revocationPollingMs));
+        }
         deferredUncachingExecutor.schedule(
             new UncachingTask(key, revocationMs),
             revocationPollingMs, TimeUnit.MILLISECONDS);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FileJournalManager.java

@@ -320,9 +320,11 @@ public class FileJournalManager implements JournalManager {
       Collection<EditLogInputStream> streams, long fromTxId,
       boolean inProgressOk) throws IOException {
     List<EditLogFile> elfs = matchEditLogs(sd.getCurrentDir());
+    if (LOG.isDebugEnabled()) {
       LOG.debug(this + ": selecting input streams starting at " + fromTxId +
           (inProgressOk ? " (inProgress ok) " : " (excluding inProgress) ") +
           "from among " + elfs.size() + " candidate file(s)");
+    }
     addStreamsToCollectionFromFiles(elfs, streams, fromTxId, inProgressOk);
   }
   
@@ -331,8 +333,10 @@ public class FileJournalManager implements JournalManager {
     for (EditLogFile elf : elfs) {
       if (elf.isInProgress()) {
         if (!inProgressOk) {
+          if (LOG.isDebugEnabled()) {
             LOG.debug("passing over " + elf + " because it is in progress " +
                 "and we are ignoring in-progress logs.");
+          }
           continue;
         }
         try {
@@ -345,9 +349,11 @@ public class FileJournalManager implements JournalManager {
       }
       if (elf.lastTxId < fromTxId) {
         assert elf.lastTxId != HdfsConstants.INVALID_TXID;
+        if (LOG.isDebugEnabled()) {
           LOG.debug("passing over " + elf + " because it ends at " +
               elf.lastTxId + ", but we only care about transactions " +
               "as new as " + fromTxId);
+        }
         continue;
       }
       EditLogFileInputStream elfis = new EditLogFileInputStream(elf.getFile(),

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java

@@ -1534,9 +1534,11 @@ public class NameNode implements NameNodeStatusMXBean {
       URI defaultUri = URI.create(HdfsConstants.HDFS_URI_SCHEME + "://"
           + conf.get(DFS_NAMENODE_RPC_ADDRESS_KEY));
       conf.set(FS_DEFAULT_NAME_KEY, defaultUri.toString());
+      if (LOG.isDebugEnabled()) {
         LOG.debug("Setting " + FS_DEFAULT_NAME_KEY + " to " + defaultUri.toString());
       }
     }
+  }
     
   /** 
    * Get the name service Id for the node

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/shortcircuit/ShortCircuitCache.java

@@ -446,7 +446,9 @@ public class ShortCircuitCache implements Closeable {
           purgeReason = "purging replica because it is stale.";
         }
         if (purgeReason != null) {
+          if (LOG.isDebugEnabled()) {
             LOG.debug(this + ": " + purgeReason);
+          }
           purge(replica);
         }
       }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/tools/offlineImageViewer/FSImageLoader.java

@@ -147,8 +147,10 @@ class FSImageLoader {
             summary.getCodec(), new BufferedInputStream(new LimitInputStream(
             fin, s.getLength())));
 
+        if (LOG.isDebugEnabled()) {
           LOG.debug("Loading section " + s.getName() + " length: " + s.getLength
               ());
+        }
         switch (FSImageFormatProtobuf.SectionName.fromString(s.getName())) {
           case STRING_TABLE:
             stringTable = loadStringTable(is);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/util/LightWeightHashSet.java

@@ -126,9 +126,11 @@ public class LightWeightHashSet<T> implements Collection<T> {
     this.shrinkThreshold = (int) (capacity * minLoadFactor);
 
     entries = new LinkedElement[capacity];
+    if (LOG.isDebugEnabled()) {
       LOG.debug("initial capacity=" + initialCapacity + ", max load factor= "
           + maxLoadFactor + ", min load factor= " + minLoadFactor);
     }
+  }
 
   public LightWeightHashSet() {
     this(MINIMUM_CAPACITY, DEFAULT_MAX_LOAD_FACTOR, DEFAUT_MIN_LOAD_FACTOR);

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/TokenAspect.java

@@ -136,8 +136,10 @@ final class TokenAspect<T extends FileSystem & Renewable> {
       if (token != null) {
         fs.setDelegationToken(token);
         addRenewAction(fs);
+        if(LOG.isDebugEnabled()) {
           LOG.debug("Created new DT for " + token.getService());
         }
+      }
       hasInitedToken = true;
     }
   }
@@ -149,7 +151,9 @@ final class TokenAspect<T extends FileSystem & Renewable> {
   synchronized void initDelegationToken(UserGroupInformation ugi) {
     Token<?> token = selectDelegationToken(ugi);
     if (token != null) {
+      if(LOG.isDebugEnabled()) {
         LOG.debug("Found existing DT for " + token.getService());
+      }
       fs.setDelegationToken(token);
       hasInitedToken = true;
     }

hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java

@@ -224,12 +224,16 @@ public class WebHdfsFileSystem extends FileSystem
       // refetch tokens.  even if ugi has credentials, don't attempt
       // to get another token to match hdfs/rpc behavior
       if (token != null) {
+        if(LOG.isDebugEnabled()) {
           LOG.debug("Using UGI token: " + token);
+        }
         canRefreshDelegationToken = false; 
       } else {
         token = getDelegationToken(null);
         if (token != null) {
+          if(LOG.isDebugEnabled()) {
             LOG.debug("Fetched new token: " + token);
+          }
         } else { // security is disabled
           canRefreshDelegationToken = false;
         }
@@ -244,7 +248,9 @@ public class WebHdfsFileSystem extends FileSystem
     boolean replaced = false;
     if (canRefreshDelegationToken) {
       Token<?> token = getDelegationToken(null);
+      if(LOG.isDebugEnabled()) {
         LOG.debug("Replaced expired token: " + token);
+      }
       setDelegationToken(token);
       replaced = (token != null);
     }
@@ -1188,7 +1194,9 @@ public class WebHdfsFileSystem extends FileSystem
         cancelDelegationToken(delegationToken);
       }
     } catch (IOException ioe) {
+      if (LOG.isDebugEnabled()) {
         LOG.debug("Token cancel failed: " + ioe);
+      }
     } finally {
       super.close();
     }