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 82E90200D33 for ; Wed, 25 Oct 2017 07:43:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 82102160BF1; Wed, 25 Oct 2017 05:43:15 +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 C95AA1609C8 for ; Wed, 25 Oct 2017 07:43:14 +0200 (CEST) Received: (qmail 23622 invoked by uid 500); 25 Oct 2017 05:43:13 -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 23612 invoked by uid 99); 25 Oct 2017 05:43:13 -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; Wed, 25 Oct 2017 05:43:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D7EB7DFBD3; Wed, 25 Oct 2017 05:43:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: naganarasimha_gr@apache.org To: common-commits@hadoop.apache.org Message-Id: <2197eebfc2f34df2a119a8c961bf97a5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: Remove parent's env vars from child processes. Contributed by Vinayakumar B. Date: Wed, 25 Oct 2017 05:43:10 +0000 (UTC) archived-at: Wed, 25 Oct 2017 05:43:15 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.7 3b45c278a -> bfa736b77 Remove parent's env vars from child processes. Contributed by Vinayakumar B. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bfa736b7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bfa736b7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bfa736b7 Branch: refs/heads/branch-2.7 Commit: bfa736b7782b0075b3dc4c956ae7426952c49f83 Parents: 3b45c27 Author: Naganarasimha Authored: Wed Oct 25 11:12:30 2017 +0530 Committer: Naganarasimha Committed: Wed Oct 25 11:12:30 2017 +0530 ---------------------------------------------------------------------- .../hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bfa736b7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.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/LinuxContainerExecutor.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java index e194c95..e4288fe 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java @@ -229,7 +229,7 @@ public class LinuxContainerExecutor extends ContainerExecutor { buildMainArgs(command, user, appId, locId, nmAddr, localDirs); String[] commandArray = command.toArray(new String[command.size()]); ShellCommandExecutor shExec = new ShellCommandExecutor(commandArray, - null, null, 0L, true); + null, null, 0L, false); if (LOG.isDebugEnabled()) { LOG.debug("initApplication: " + Arrays.toString(commandArray)); } @@ -291,7 +291,8 @@ public class LinuxContainerExecutor extends ContainerExecutor { resourcesOptions)); String[] commandArray = command.toArray(new String[command.size()]); shExec = new ShellCommandExecutor(commandArray, null, // NM's cwd - container.getLaunchContext().getEnvironment()); // sanitized env + container.getLaunchContext().getEnvironment(), 0L, + false); // sanitized env if (LOG.isDebugEnabled()) { LOG.debug("launchContainer: " + Arrays.toString(commandArray)); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org