Author: cutting
Date: Tue Jan 9 17:19:34 2007
New Revision: 494676
URL: http://svn.apache.org/viewvc?view=rev&rev=494676
Log:
HADOOP-873. Pass java.library.path correctly to child processes. Contributed
by Owen.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/util/NativeCodeLoader.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=494676&r1=494675&r2=494676
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Tue Jan 9 17:19:34 2007
@@ -29,6 +29,9 @@
9. HADOOP-865. Fix S3 FileSystem so that partially created files can
be deleted. (Tom White via cutting)
+10. HADOOP-873. Pass java.library.path correctly to child processes.
+ (omalley via cutting)
+
Release 0.10.0 - 2007-01-05
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java?view=diff&rev=494676&r1=494675&r2=494676
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskRunner.java Tue
Jan 9 17:19:34 2007
@@ -204,17 +204,18 @@
// Add classpath.
vargs.add("-classpath");
vargs.add(classPath.toString());
- // Add main class and its arguments
- vargs.add(TaskTracker.Child.class.getName()); // main of Child
- vargs.add(tracker.taskReportPort + ""); // pass umbilical port
- vargs.add(t.getTaskId()); // pass task identifier
-
+
// Add java.library.path; necessary for native-hadoop libraries
String libraryPath = System.getProperty("java.library.path");
if (libraryPath != null) {
vargs.add("-Djava.library.path=" + libraryPath);
}
-
+
+ // Add main class and its arguments
+ vargs.add(TaskTracker.Child.class.getName()); // main of Child
+ vargs.add(tracker.taskReportPort + ""); // pass umbilical port
+ vargs.add(t.getTaskId()); // pass task identifier
+
// Run java
runChild((String[])vargs.toArray(new String[0]), workDir);
} catch (FSError e) {
Modified:
lucene/hadoop/trunk/src/java/org/apache/hadoop/util/NativeCodeLoader.java
URL:
http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/util/NativeCodeLoader.java?view=diff&rev=494676&r1=494675&r2=494676
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/util/NativeCodeLoader.java
(original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/util/NativeCodeLoader.java
Tue Jan 9 17:19:34 2007
@@ -44,6 +44,7 @@
} catch (Throwable t) {
// Ignore failure to load
LOG.debug("Failed to load native-hadoop with error: " + t);
+ LOG.debug("java.library.path=" +
System.getProperty("java.library.path"));
}
if (!nativeCodeLoaded) {
