From fc74b5a25cdb5e5c6145d3c60a36f9f8e0acc9ef Mon Sep 17 00:00:00 2001 From: Arun Murthy Date: Thu, 27 Oct 2011 08:28:34 +0000 Subject: [PATCH] MAPREDUCE-3259. Added java.library.path of NodeManager to ContainerLocalizer in LinuxContainerExecutor. Contributed by Kihwal Lee. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1189667 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../yarn/server/nodemanager/LinuxContainerExecutor.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index a21fcb8233..b529c35cd8 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1798,6 +1798,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3257. Added authorization checks for the protocol between ResourceManager and ApplicatoinMaster. (vinodkv via acmurthy) + MAPREDUCE-3259. Added java.library.path of NodeManager to + ContainerLocalizer in LinuxContainerExecutor. (Kihwal Lee via acmurthy) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java index 63765428f1..0da76b29f4 100644 --- a/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java +++ b/hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/LinuxContainerExecutor.java @@ -115,6 +115,10 @@ public void startLocalizer(Path nmPrivateContainerTokensPath, command.add(jvm.toString()); command.add("-classpath"); command.add(System.getProperty("java.class.path")); + String javaLibPath = System.getProperty("java.library.path"); + if (javaLibPath != null) { + command.add("-Djava.library.path=" + javaLibPath); + } command.add(ContainerLocalizer.class.getName()); command.add(user); command.add(appId);