Author: szetszwo
Date: Thu Feb 27 03:11:07 2014
New Revision: 1572418
URL: http://svn.apache.org/r1572418
Log:
Merge r1569890 through r1572417 from trunk.
Modified:
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/bin/yarn
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
Modified: hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt?rev=1572418&r1=1572417&r2=1572418&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt (original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/CHANGES.txt Thu Feb 27
03:11:07 2014
@@ -32,6 +32,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
@@ -235,6 +238,9 @@ Release 2.4.0 - UNRELEASED
YARN-1749. Updated application-history related configs to reflect the
latest
reality and to be consistently named. (Zhijie Shen via vinodkv)
+ YARN-1301. Added the INFO level log of the non-empty blacklist additions
+ and removals inside ApplicationMasterService. (Tsuyoshi Ozawa via zjshen)
+
OPTIMIZATIONS
BUG FIXES
Modified:
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/bin/yarn
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/bin/yarn?rev=1572418&r1=1572417&r2=1572418&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/bin/yarn
(original)
+++ hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/bin/yarn
Thu Feb 27 03:11:07 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
Modified:
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java?rev=1572418&r1=1572417&r2=1572418&view=diff
==============================================================================
---
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
(original)
+++
hadoop/common/branches/HDFS-5535/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ApplicationMasterService.java
Thu Feb 27 03:11:07 2014
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -447,10 +448,10 @@ public class ApplicationMasterService ex
request.getResourceBlacklistRequest();
List<String> blacklistAdditions =
(blacklistRequest != null) ?
- blacklistRequest.getBlacklistAdditions() : null;
+ blacklistRequest.getBlacklistAdditions() :
Collections.EMPTY_LIST;
List<String> blacklistRemovals =
(blacklistRequest != null) ?
- blacklistRequest.getBlacklistRemovals() : null;
+ blacklistRequest.getBlacklistRemovals() : Collections.EMPTY_LIST;
// sanity check
try {
@@ -487,6 +488,11 @@ public class ApplicationMasterService ex
this.rScheduler.allocate(appAttemptId, ask, release,
blacklistAdditions, blacklistRemovals);
+ if (!blacklistAdditions.isEmpty() || !blacklistRemovals.isEmpty()) {
+ LOG.info("blacklist are updated in Scheduler." +
+ "blacklistAdditions: " + blacklistAdditions + ", " +
+ "blacklistRemovals: " + blacklistRemovals);
+ }
RMAppAttempt appAttempt = app.getRMAppAttempt(appAttemptId);
AllocateResponse allocateResponse =
recordFactory.newRecordInstance(AllocateResponse.class);
