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 <[email protected]> Authored: Wed Oct 25 11:12:30 2017 +0530 Committer: Naganarasimha <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
