You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yarn-commits@hadoop.apache.org by ka...@apache.org on 2014/02/27 03:19:13 UTC
svn commit: r1572406 - in
/hadoop/common/branches/branch-2/hadoop-yarn-project: CHANGES.txt
hadoop-yarn/bin/yarn
Author: kasha
Date: Thu Feb 27 02:19:13 2014
New Revision: 1572406
URL: http://svn.apache.org/r1572406
Log:
YARN-1429. *nix: Allow a way for users to augment classpath of YARN daemons. (Jarek Jarcec Cecho via kasha)
Modified:
hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt?rev=1572406&r1=1572405&r2=1572406&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/CHANGES.txt Thu Feb 27 02:19:13 2014
@@ -17,6 +17,9 @@ Release 2.5.0 - UNRELEASED
YARN-1561. Fix a generic type warning in FairScheduler. (Chen He via junping_du)
+ YARN-1429. *nix: Allow a way for users to augment classpath of YARN daemons.
+ (Jarek Jarcec Cecho via kasha)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn?rev=1572406&r1=1572405&r2=1572406&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn (original)
+++ hadoop/common/branches/branch-2/hadoop-yarn-project/hadoop-yarn/bin/yarn Thu Feb 27 02:19:13 2014
@@ -22,7 +22,12 @@
#
# JAVA_HOME The java implementation to use. Overrides JAVA_HOME.
#
-# YARN_CLASSPATH Extra Java CLASSPATH entries.
+# YARN_USER_CLASSPATH Additional user CLASSPATH entries.
+#
+# YARN_USER_CLASSPATH_FIRST If set to non empty value then the user classpath
+# specified in YARN_USER_CLASSPATH will be
+# appended at the beginning of YARN's final
+# classpath instead of at the end.
#
# YARN_HEAPSIZE The maximum amount of heap to use, in MB.
# Default is 1000.
@@ -163,6 +168,17 @@ fi
CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/${YARN_DIR}/*
CLASSPATH=${CLASSPATH}:$HADOOP_YARN_HOME/${YARN_LIB_JARS_DIR}/*
+# Add user defined YARN_USER_CLASSPATH to the class path (if defined)
+if [ -n "$YARN_USER_CLASSPATH" ]; then
+ if [ -n "$YARN_USER_CLASSPATH_FIRST" ]; then
+ # User requested to add the custom entries at the beginning
+ CLASSPATH=${YARN_USER_CLASSPATH}:${CLASSPATH}
+ else
+ # By default we will just append the extra entries at the end
+ CLASSPATH=${CLASSPATH}:${YARN_USER_CLASSPATH}
+ fi
+fi
+
# so that filenames w/ spaces are handled correctly in loops below
IFS=
@@ -249,4 +265,3 @@ if [ "x$JAVA_LIBRARY_PATH" != "x" ]; the
fi
exec "$JAVA" -Dproc_$COMMAND $JAVA_HEAP_MAX $YARN_OPTS -classpath "$CLASSPATH" $CLASS "$@"
-fi