Repository: hadoop Updated Branches: refs/heads/branch-2 4e752a37e -> 52cc2ca48
HADOOP-12428. Fix inconsistency between log-level guards and statements. Contributed by Jagadesh Kiran N and Jackie Chang. (cherry picked from commit dfd807afab0fae3839c9cc5d552aa0304444f956) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/52cc2ca4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/52cc2ca4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/52cc2ca4 Branch: refs/heads/branch-2 Commit: 52cc2ca4885478578a88abf7a97467048b9ec0e4 Parents: 4e752a3 Author: Tsuyoshi Ozawa <[email protected]> Authored: Tue Sep 22 12:54:29 2015 +0900 Committer: Tsuyoshi Ozawa <[email protected]> Committed: Tue Sep 22 12:54:44 2015 +0900 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java | 4 ++-- .../java/org/apache/hadoop/hdfs/server/namenode/BackupImage.java | 2 +- .../apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java | 2 +- .../org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java | 2 +- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java | 2 +- .../apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java | 2 +- .../org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java | 3 ++- .../java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java | 2 +- hadoop-yarn-project/CHANGES.txt | 3 +++ .../org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java | 2 +- .../org/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index f3a16e9..455aa3e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -276,6 +276,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/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 5b3515d..6e34d9c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -593,6 +593,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java ---------------------------------------------------------------------- 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 4f6dc96..8c4e38a 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 @@ class DataXceiver extends Receiver implements Runnable { 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 @@ class DataXceiver extends Receiver implements Runnable { // 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); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/BackupImage.java ---------------------------------------------------------------------- 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 0da1cad..a8e8e60 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 @@ -213,7 +213,7 @@ public class BackupImage extends FSImage { 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 = http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/BootstrapStandby.java ---------------------------------------------------------------------- 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 f3fbcae..26fd9a0 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 @@ -359,7 +359,7 @@ public class BootstrapStandby implements Tool, Configurable { "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); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/ha/EditLogTailer.java ---------------------------------------------------------------------- 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 38aa358..6ac3656 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 @@ -237,7 +237,7 @@ public class EditLogTailer { 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)); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 0542837..ba83864 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -115,6 +115,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerAllocator.java ---------------------------------------------------------------------- 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 2a15e13..82a3eec 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 @@ -1102,7 +1102,7 @@ public class RMContainerAllocator extends RMContainerRequestor 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()); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/rm/RMContainerRequestor.java ---------------------------------------------------------------------- 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 155711f..d612126 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 @@ public abstract class RMContainerRequestor extends RMCommunicator { 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()); http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/UniformSizeInputFormat.java ---------------------------------------------------------------------- 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 8dc7a65..8f31234 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 @@ public class UniformSizeInputFormat 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); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-tools/hadoop-gridmix/src/main/java/org/apache/hadoop/mapred/gridmix/SerialJobFactory.java ---------------------------------------------------------------------- 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 af554ff..471d140 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 class SerialJobFactory extends JobFactory<JobStats> { return; } if (LOG.isDebugEnabled()) { - LOG.info(" job " + job.getName() + " completed "); + LOG.debug(" job " + job.getName() + " completed "); } break; } http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 146c942..df4bec9 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -405,6 +405,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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/main/java/org/apache/hadoop/yarn/client/api/impl/AMRMClientImpl.java ---------------------------------------------------------------------- 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 b1324c1..4cf9aa0 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 @@ public class AMRMClientImpl<T extends ContainerRequest> extends AMRMClient<T> { } if (LOG.isDebugEnabled()) { - LOG.info("AFTER decResourceRequest:" + " applicationId=" + LOG.debug("AFTER decResourceRequest:" + " applicationId=" + " priority=" + priority.getPriority() + " resourceName=" + resourceName + " numContainers=" + resourceRequestInfo.remoteRequest.getNumContainers() http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/ContainerTokenSelector.java ---------------------------------------------------------------------- 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 5a3b494..a1c0a91 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 class ContainerTokenSelector implements } for (Token<? extends TokenIdentifier> 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()) && http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/security/NMTokenSelector.java ---------------------------------------------------------------------- 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 c57e4a2..43899b5 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 class NMTokenSelector implements } for (Token<? extends TokenIdentifier> 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()) && http://git-wip-us.apache.org/repos/asf/hadoop/blob/52cc2ca4/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 ---------------------------------------------------------------------- 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 b43f658..869b49a 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 @@ public class LeafQueue extends AbstractCSQueue { 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()
