Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 8C9BB200D42 for ; Thu, 2 Nov 2017 18:30:06 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8B42A160BFB; Thu, 2 Nov 2017 17:30:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id D0D251609EB for ; Thu, 2 Nov 2017 18:30:05 +0100 (CET) Received: (qmail 12646 invoked by uid 500); 2 Nov 2017 17:29:55 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 11214 invoked by uid 99); 2 Nov 2017 17:29:54 -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; Thu, 02 Nov 2017 17:29:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2F74BDFFB3; Thu, 2 Nov 2017 17:29:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: haibochen@apache.org To: common-commits@hadoop.apache.org Date: Thu, 02 Nov 2017 17:30:28 -0000 Message-Id: <5cdb5be549824727b07403f8c50808db@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/50] [abbrv] hadoop git commit: YARN-7396. NPE when accessing container logs due to null dirsHandler. Contributed by Jonathan Hung archived-at: Thu, 02 Nov 2017 17:30:06 -0000 YARN-7396. NPE when accessing container logs due to null dirsHandler. Contributed by Jonathan Hung Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0cc98ae0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0cc98ae0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0cc98ae0 Branch: refs/heads/YARN-1011 Commit: 0cc98ae0ec69419ded066f3f7decf59728b35e9d Parents: 7a49ddf Author: Jian He Authored: Wed Nov 1 17:00:32 2017 -0700 Committer: Jian He Committed: Wed Nov 1 17:00:32 2017 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/yarn/server/nodemanager/NodeManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0cc98ae0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.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/NodeManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java index 7a6106e..bddc7c3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/NodeManager.java @@ -367,6 +367,8 @@ public class NodeManager extends CompositeService this.aclsManager = new ApplicationACLsManager(conf); + this.dirsHandler = new LocalDirsHandlerService(metrics); + boolean isDistSchedulingEnabled = conf.getBoolean(YarnConfiguration.DIST_SCHEDULING_ENABLED, YarnConfiguration.DEFAULT_DIST_SCHEDULING_ENABLED); @@ -390,7 +392,6 @@ public class NodeManager extends CompositeService // NodeManager level dispatcher this.dispatcher = new AsyncDispatcher("NM Event dispatcher"); - dirsHandler = new LocalDirsHandlerService(metrics); nodeHealthChecker = new NodeHealthCheckerService( getNodeHealthScriptRunner(conf), dirsHandler); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org