From ed3bee84c29e49ddc74692c42876664d2f02d5fb Mon Sep 17 00:00:00 2001 From: tqchen Date: Thu, 12 Mar 2015 22:48:30 -0700 Subject: [PATCH] add command back --- .../apache/hadoop/yarn/rabit/ApplicationMaster.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/yarn/src/org/apache/hadoop/yarn/rabit/ApplicationMaster.java b/yarn/src/org/apache/hadoop/yarn/rabit/ApplicationMaster.java index 9b7885c56..481175536 100644 --- a/yarn/src/org/apache/hadoop/yarn/rabit/ApplicationMaster.java +++ b/yarn/src/org/apache/hadoop/yarn/rabit/ApplicationMaster.java @@ -274,10 +274,17 @@ public class ApplicationMaster { task.containerRequest = null; ContainerLaunchContext ctx = Records .newRecord(ContainerLaunchContext.class); + String hadoop = "hadoop"; + if (System.getenv("HADOOP_HOME") != null) { + hadoop = "${HADOOP_HOME}/bin/hadoop"; + } else if (System.getenv("HADOOP_PREFIX") != null) { + hadoop = "${HADOOP_PREFIX}/bin/hadoop"; + } + String cmd = // use this to setup CLASSPATH correctly for libhdfs - // "CLASSPATH=${CLASSPATH}:`" + hadoop + " classpath --glob` " - this.command + " 1>" + "CLASSPATH=${CLASSPATH}:`" + hadoop + " classpath --glob` " + + this.command + " 1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stdout" + " 2>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + "/stderr";