You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flume.apache.org by mp...@apache.org on 2012/06/19 00:59:41 UTC
svn commit: r1351528 - in /incubator/flume/trunk: bin/flume-ng
flume-ng-core/src/main/java/org/apache/flume/tools/GetJavaProperty.java
Author: mpercy
Date: Mon Jun 18 22:59:41 2012
New Revision: 1351528
URL: http://svn.apache.org/viewvc?rev=1351528&view=rev
Log:
FLUME-1248. flume-ng script breaks if hbase-env.sh sets certain Java opts.
(Will McQueen via Mike Percy)
Modified:
incubator/flume/trunk/bin/flume-ng
incubator/flume/trunk/flume-ng-core/src/main/java/org/apache/flume/tools/GetJavaProperty.java
Modified: incubator/flume/trunk/bin/flume-ng
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/bin/flume-ng?rev=1351528&r1=1351527&r2=1351528&view=diff
==============================================================================
--- incubator/flume/trunk/bin/flume-ng (original)
+++ incubator/flume/trunk/bin/flume-ng Mon Jun 18 22:59:41 2012
@@ -68,6 +68,18 @@ add_hadoop_paths() {
local HADOOP_JAVA_LIBRARY_PATH=$(HADOOP_CLASSPATH="$FLUME_CLASSPATH" \
${HADOOP_IN_PATH} org.apache.flume.tools.GetJavaProperty \
java.library.path 2>/dev/null)
+
+ # look for the line that has the desired property value
+ # (considering extraneous output from some GC options that write to stdout)
+ IFS=$'\n'
+ for line in $HADOOP_JAVA_LIBRARY_PATH; do
+ if [[ $line =~ ^java\.library\.path=([^\n]*) ]]; then
+ HADOOP_JAVA_LIBRARY_PATH=${BASH_REMATCH[1]}
+ break
+ fi
+ done
+ unset IFS
+
if [ -n "${HADOOP_JAVA_LIBRARY_PATH}" ]; then
FLUME_JAVA_LIBRARY_PATH="$FLUME_JAVA_LIBRARY_PATH:$HADOOP_JAVA_LIBRARY_PATH"
fi
@@ -104,6 +116,18 @@ add_HBASE_paths() {
local HBASE_JAVA_LIBRARY_PATH=$(HBASE_CLASSPATH="$FLUME_CLASSPATH" \
${HBASE_IN_PATH} org.apache.flume.tools.GetJavaProperty \
java.library.path 2>/dev/null)
+
+ # look for the line that has the desired property value
+ # (considering extraneous output from some GC options that write to stdout)
+ IFS=$'\n'
+ for line in $HBASE_JAVA_LIBRARY_PATH; do
+ if [[ $line =~ ^java\.library\.path=([^\n]*) ]]; then
+ HBASE_JAVA_LIBRARY_PATH=${BASH_REMATCH[1]}
+ break
+ fi
+ done
+ unset IFS
+
if [ -n "${HBASE_JAVA_LIBRARY_PATH}" ]; then
FLUME_JAVA_LIBRARY_PATH="$FLUME_JAVA_LIBRARY_PATH:$HBASE_JAVA_LIBRARY_PATH"
fi
Modified: incubator/flume/trunk/flume-ng-core/src/main/java/org/apache/flume/tools/GetJavaProperty.java
URL: http://svn.apache.org/viewvc/incubator/flume/trunk/flume-ng-core/src/main/java/org/apache/flume/tools/GetJavaProperty.java?rev=1351528&r1=1351527&r2=1351528&view=diff
==============================================================================
--- incubator/flume/trunk/flume-ng-core/src/main/java/org/apache/flume/tools/GetJavaProperty.java (original)
+++ incubator/flume/trunk/flume-ng-core/src/main/java/org/apache/flume/tools/GetJavaProperty.java Mon Jun 18 22:59:41 2012
@@ -28,7 +28,7 @@ public class GetJavaProperty {
}
} else {
for (String prop : args) {
- System.out.println(System.getProperty(prop, ""));
+ System.out.println(prop + "=" + System.getProperty(prop, ""));
}
}
}