Repository: hadoop Updated Branches: refs/heads/branch-2 bc0487c29 -> cf873fff9
http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf873fff/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java index 6a2818f..d69aeb1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java @@ -240,16 +240,12 @@ 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); - } + LOG.debug("Using UGI token: {}", token); canRefreshDelegationToken = false; } else { token = getDelegationToken(null); if (token != null) { - if(LOG.isDebugEnabled()) { - LOG.debug("Fetched new token: {}", token); - } + LOG.debug("Fetched new token: {}", token); } else { // security is disabled canRefreshDelegationToken = false; } @@ -264,9 +260,7 @@ public class WebHdfsFileSystem extends FileSystem boolean replaced = false; if (canRefreshDelegationToken) { Token<?> token = getDelegationToken(null); - if(LOG.isDebugEnabled()) { - LOG.debug("Replaced expired token: {}", token); - } + LOG.debug("Replaced expired token: {}", token); setDelegationToken(token); replaced = (token != null); } @@ -451,9 +445,7 @@ public class WebHdfsFileSystem extends FileSystem InetSocketAddress nnAddr = getCurrentNNAddr(); final URL url = new URL(getTransportScheme(), nnAddr.getHostName(), nnAddr.getPort(), path + '?' + query); - if (LOG.isTraceEnabled()) { - LOG.trace("url={}", url); - } + LOG.trace("url={}", url); return url; } @@ -488,9 +480,7 @@ public class WebHdfsFileSystem extends FileSystem + Param.toSortedString("&", getAuthParameters(op)) + Param.toSortedString("&", parameters); final URL url = getNamenodeURL(path, query); - if (LOG.isTraceEnabled()) { - LOG.trace("url={}", url); - } + LOG.trace("url={}", url); return url; } @@ -778,9 +768,7 @@ public class WebHdfsFileSystem extends FileSystem } catch (Exception e) { // catch json parser errors final IOException ioe = new IOException("Response decoding failure: "+e.toString(), e); - if (LOG.isDebugEnabled()) { - LOG.debug("Response decoding failure: {}", e.toString(), e); - } + LOG.debug("Response decoding failure.", e); throw ioe; } finally { conn.disconnect(); @@ -1251,9 +1239,7 @@ public class WebHdfsFileSystem extends FileSystem cancelDelegationToken(delegationToken); } } catch (IOException ioe) { - if (LOG.isDebugEnabled()) { - LOG.debug("Token cancel failed: ", ioe); - } + LOG.debug("Token cancel failed: ", ioe); } finally { super.close(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/cf873fff/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 7d366ad..d82ee41 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -655,6 +655,9 @@ Release 2.8.0 - UNRELEASED HDFS-8696. Make the lower and higher watermark in the DN Netty server configurable. (Xiaobing Zhou via wheat9) + HDFS-8971. Remove guards when calling LOG.debug() and LOG.trace() in client + package. (Mingliang Liu via wheat9) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than