From dfd807afab0fae3839c9cc5d552aa0304444f956 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Ozawa Date: Tue, 22 Sep 2015 12:54:29 +0900 Subject: [PATCH] HADOOP-12428. Fix inconsistency between log-level guards and statements. Contributed by Jagadesh Kiran N and Jackie Chang. --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/DataXceiver.java | 4 ++-- .../org/apache/hadoop/hdfs/server/namenode/BackupImage.java | 2 +- .../hadoop/hdfs/server/namenode/ha/BootstrapStandby.java | 2 +- .../apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java | 2 +- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java | 2 +- .../hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java | 2 +- .../apache/hadoop/tools/mapred/UniformSizeInputFormat.java | 3 ++- .../org/apache/hadoop/mapred/gridmix/SerialJobFactory.java | 2 +- hadoop-yarn-project/CHANGES.txt | 3 +++ .../apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java | 2 +- .../apache/hadoop/yarn/security/ContainerTokenSelector.java | 2 +- .../java/org/apache/hadoop/yarn/security/NMTokenSelector.java | 2 +- .../server/resourcemanager/scheduler/capacity/LeafQueue.java | 4 ++-- 16 files changed, 27 insertions(+), 14 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 0c8550df99..6bc3379378 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -788,6 +788,9 @@ Release 2.8.0 - UNRELEASED JarFile with other users when loading resource from URL in Configuration class. (zxu) + HADOOP-12428. Fix inconsistency between log-level guards and statements. + (Jagadesh Kiran N and Jackie Chang via ozawa) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 944986c27b..44774a7c8c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -941,6 +941,9 @@ Release 2.8.0 - UNRELEASED HDFS-9111. Move hdfs-client protobuf convert methods from PBHelper to PBHelperClient. (Mingliang Liu via wheat9) + HADOOP-12428. Fix inconsistency between log-level guards and statements. + (Jagadesh Kiran N and Jackie Chang via ozawa) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java index 4f6dc9652c..8c4e38a56e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java @@ -752,7 +752,7 @@ public void writeBlock(final ExtendedBlock block, mirrorInStatus = connectAck.getStatus(); firstBadLink = connectAck.getFirstBadLink(); if (LOG.isDebugEnabled() || mirrorInStatus != SUCCESS) { - LOG.info("Datanode " + targets.length + + LOG.debug("Datanode " + targets.length + " got response for connect ack " + " from downstream datanode with firstbadlink as " + firstBadLink); @@ -791,7 +791,7 @@ public void writeBlock(final ExtendedBlock block, // send connect-ack to source for clients and not transfer-RBW/Finalized if (isClient && !isTransfer) { if (LOG.isDebugEnabled() || mirrorInStatus != SUCCESS) { - LOG.info("Datanode " + targets.length + + LOG.debug("Datanode " + targets.length + " forwarding connect ack to upstream firstbadlink is " + firstBadLink); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupImage.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupImage.java index c6ae0d56a6..450ddee9e0 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupImage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupImage.java @@ -200,7 +200,7 @@ private synchronized void applyEdits(long firstTxId, int numTxns, byte[] data) assert backupInputStream.length() == 0 : "backup input stream is not empty"; try { if (LOG.isTraceEnabled()) { - LOG.debug("data:" + StringUtils.byteToHexString(data)); + LOG.trace("data:" + StringUtils.byteToHexString(data)); } FSEditLogLoader logLoader = diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java index a84dcf1d3a..deb76b3176 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java @@ -375,7 +375,7 @@ private boolean checkLogsAvailableForRead(FSImage image, long imageTxId, "or call saveNamespace on the active node.\n" + "Error: " + e.getLocalizedMessage(); if (LOG.isDebugEnabled()) { - LOG.fatal(msg, e); + LOG.debug(msg, e); } else { LOG.fatal(msg); } diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java index cfca77c6a0..59f90a6db3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java @@ -260,7 +260,7 @@ void doTailEdits() throws IOException, InterruptedException { throw elie; } finally { if (editsLoaded > 0 || LOG.isDebugEnabled()) { - LOG.info(String.format("Loaded %d edits starting from txid %d ", + LOG.debug(String.format("Loaded %d edits starting from txid %d ", editsLoaded, lastTxnId)); } } diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 42ea011465..bcdac1f748 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -387,6 +387,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6483. Replace deprecated method NameNode.getUri() with DFSUtilClient.getNNUri() in TestMRCredentials. (Mingliang Liu via wheat9) + HADOOP-12428. Fix inconsistency between log-level guards and statements. + (Jagadesh Kiran N and Jackie Chang via ozawa) + OPTIMIZATIONS MAPREDUCE-6376. Add avro binary support for jhist files (Ray Chiang via diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java index 78b0dc434f..74a275300a 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java @@ -1122,7 +1122,7 @@ private void containerAssigned(Container allocated, assignedRequests.add(allocated, assigned.attemptID); if (LOG.isDebugEnabled()) { - LOG.info("Assigned container (" + allocated + ") " + LOG.debug("Assigned container (" + allocated + ") " + " to task " + assigned.attemptID + " on node " + allocated.getNodeId().toString()); } diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java index 155711fe07..d612126ae4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java @@ -506,7 +506,7 @@ private void decResourceRequest(Priority priority, String resourceName, addResourceRequestToAsk(remoteRequest); if (LOG.isDebugEnabled()) { - LOG.info("AFTER decResourceRequest:" + " applicationId=" + LOG.debug("AFTER decResourceRequest:" + " applicationId=" + applicationId.getId() + " priority=" + priority.getPriority() + " resourceName=" + resourceName + " numContainers=" + remoteRequest.getNumContainers() + " #asks=" + ask.size()); diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java index 8dc7a65985..8f31234d05 100644 --- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java +++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java @@ -112,7 +112,8 @@ private List getSplits(Configuration configuration, int numSplits, FileSplit split = new FileSplit(listingFilePath, lastSplitStart, lastPosition - lastSplitStart, null); if (LOG.isDebugEnabled()) { - LOG.info ("Creating split : " + split + ", bytes in split: " + currentSplitSize); + LOG.debug("Creating split : " + split + ", bytes in split: " + + currentSplitSize); } splits.add(split); } diff --git a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java index af554ff0b1..471d140149 100644 --- a/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java +++ b/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java @@ -130,7 +130,7 @@ public void run() { return; } if (LOG.isDebugEnabled()) { - LOG.info(" job " + job.getName() + " completed "); + LOG.debug(" job " + job.getName() + " completed "); } break; } diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0e20d9a3b8..329e743727 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -457,6 +457,9 @@ Release 2.8.0 - UNRELEASED YARN-3920. FairScheduler container reservation on a node should be configurable to limit it to large containers (adhoot via asuresh) + HADOOP-12428. Fix inconsistency between log-level guards and statements. + (Jagadesh Kiran N and Jackie Chang via ozawa) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java index b1324c1d7b..4cf9aa0890 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java @@ -748,7 +748,7 @@ private void decResourceRequest(Priority priority, } if (LOG.isDebugEnabled()) { - LOG.info("AFTER decResourceRequest:" + " applicationId=" + LOG.debug("AFTER decResourceRequest:" + " applicationId=" + " priority=" + priority.getPriority() + " resourceName=" + resourceName + " numContainers=" + resourceRequestInfo.remoteRequest.getNumContainers() diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java index 5a3b49439f..a1c0a91402 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java @@ -46,7 +46,7 @@ public Token selectToken(Text service, } for (Token token : tokens) { if (LOG.isDebugEnabled()) { - LOG.info("Looking for service: " + service + ". Current token is " + LOG.debug("Looking for service: " + service + ". Current token is " + token); } if (ContainerTokenIdentifier.KIND.equals(token.getKind()) && diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java index c57e4a2150..43899b5aa5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java @@ -42,7 +42,7 @@ public Token selectToken(Text service, } for (Token token : tokens) { if (LOG.isDebugEnabled()) { - LOG.info("Looking for service: " + service + ". Current token is " + LOG.debug("Looking for service: " + service + ". Current token is " + token); } if (NMTokenIdentifier.KIND.equals(token.getKind()) && diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java index b43f6587d2..869b49a881 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/LeafQueue.java @@ -1163,8 +1163,8 @@ synchronized void allocateResource(Resource clusterResource, metrics.setAvailableResourcesToUser(userName, application.getHeadroom()); if (LOG.isDebugEnabled()) { - LOG.info(getQueueName() + - " user=" + userName + + LOG.debug(getQueueName() + + " user=" + userName + " used=" + queueUsage.getUsed() + " numContainers=" + numContainers + " headroom = " + application.getHeadroom() + " user-resources=" + user.getUsed()