Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 489891762B for ; Mon, 4 May 2015 15:32:50 +0000 (UTC) Received: (qmail 15023 invoked by uid 500); 4 May 2015 15:32:50 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 14957 invoked by uid 500); 4 May 2015 15:32:50 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 14946 invoked by uid 99); 4 May 2015 15:32:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 May 2015 15:32:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C360AE0254; Mon, 4 May 2015 15:32:49 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3097. Logging of resource recovery on NM restart has redundancies. Contributed by Eric Payne (cherry picked from commit 8f65c793f2930bfd16885a2ab188a9970b754974) Date: Mon, 4 May 2015 15:32:49 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 c64309f6a -> 99b49a818 YARN-3097. Logging of resource recovery on NM restart has redundancies. Contributed by Eric Payne (cherry picked from commit 8f65c793f2930bfd16885a2ab188a9970b754974) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/99b49a81 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/99b49a81 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/99b49a81 Branch: refs/heads/branch-2 Commit: 99b49a818154c7ed4bec5762816c01d4da3596b9 Parents: c64309f Author: Jason Lowe Authored: Mon May 4 15:31:15 2015 +0000 Committer: Jason Lowe Committed: Mon May 4 10:32:33 2015 -0500 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../localizer/ResourceLocalizationService.java | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/99b49a81/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index ec4c6a5..cceb578 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -248,6 +248,8 @@ Release 2.8.0 - UNRELEASED YARN-1993. Cross-site scripting vulnerability in TextView.java. (Kenji Kikushima via ozawa) + YARN-3097. Logging of resource recovery on NM restart has redundancies + (Eric Payne via jlowe) Release 2.7.1 - UNRELEASED http://git-wip-us.apache.org/repos/asf/hadoop/blob/99b49a81/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java index cdd252c..e9c45f3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java @@ -303,8 +303,10 @@ public class ResourceLocalizationService extends CompositeService for (LocalizedResourceProto proto : state.getLocalizedResources()) { LocalResource rsrc = new LocalResourcePBImpl(proto.getResource()); LocalResourceRequest req = new LocalResourceRequest(rsrc); - LOG.info("Recovering localized resource " + req + " at " - + proto.getLocalPath()); + if (LOG.isDebugEnabled()) { + LOG.debug("Recovering localized resource " + req + " at " + + proto.getLocalPath()); + } tracker.handle(new ResourceRecoveredEvent(req, new Path(proto.getLocalPath()), proto.getSize())); }