diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java index 75dc845f72a..49edea0b142 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/Shell.java @@ -136,6 +136,12 @@ public static String[] getSignalKillCommand(int code, String pid) { new String[] { "kill", "-" + code, isSetsidAvailable ? "-" + pid : pid }; } + /** Return a regular expression string that match environment variables */ + public static String getEnvironmentVariableRegex() { + return (WINDOWS) ? "%([A-Za-z_][A-Za-z0-9_]*?)%" : + "\\$([A-Za-z_][A-Za-z0-9_]*)"; + } + /** * Returns a File referencing a script with the given basename, inside the * given parent directory. The file extension is inferred by platform: ".cmd" diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 2bea91f34c8..f8302edcf9a 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -624,6 +624,9 @@ Release 2.1.0-beta - 2013-07-02 MAPREDUCE-5187. Create mapreduce command scripts on Windows. (Chuan Liu via cnauroth) + MAPREDUCE-4374. Fix child task environment variable config and add support + for Windows. (Chuan Liu via cnauroth) + MAPREDUCE-5291. Change MR App to use updated property names in container-log4j.properties. (Zhijie Shen via sseth) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java index 9eee5719752..5bae686ab20 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/JobConf.java @@ -280,12 +280,14 @@ public class JobConf extends Configuration { * Configuration key to set the environment of the child map/reduce tasks. * * The format of the value is k1=v1,k2=v2. Further it can - * reference existing environment variables via $key. + * reference existing environment variables via $key on + * Linux or %key% on Windows. * * Example: * * * @deprecated Use {@link #MAPRED_MAP_TASK_ENV} or @@ -295,31 +297,33 @@ public class JobConf extends Configuration { public static final String MAPRED_TASK_ENV = "mapred.child.env"; /** - * Configuration key to set the maximum virutal memory available to the - * map tasks. + * Configuration key to set the environment of the child map tasks. * - * The format of the value is k1=v1,k2=v2. Further it can - * reference existing environment variables via $key. + * The format of the value is k1=v1,k2=v2. Further it can + * reference existing environment variables via $key on + * Linux or %key% on Windows. * * Example: * */ public static final String MAPRED_MAP_TASK_ENV = JobContext.MAP_ENV; /** - * Configuration key to set the maximum virutal memory available to the - * reduce tasks. + * Configuration key to set the environment of the child reduce tasks. * * The format of the value is k1=v1,k2=v2. Further it can - * reference existing environment variables via $key. + * reference existing environment variables via $key on + * Linux or %key% on Windows. * * Example: * */ public static final String MAPRED_REDUCE_TASK_ENV = JobContext.REDUCE_ENV; diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml index bd6735cb9e7..0c08804d3e1 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml @@ -176,7 +176,8 @@ User added environment variables for the task tracker child processes. Example : 1) A=foo This will set the env variable A to foo - 2) B=$B:c This is inherit nodemanager's B env variable. + 2) B=$B:c This is inherit nodemanager's B env variable on Unix. + 3) B=%B%;c This is inherit nodemanager's B env variable on Windows. diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java index 429bde5f8ce..8a7504f84f0 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestMiniMRChildTask.java @@ -45,6 +45,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.MiniDFSCluster; import org.apache.hadoop.mapreduce.v2.MiniMRYarnCluster; +import org.apache.hadoop.util.Shell; /** * Class to test mapred task's @@ -172,10 +173,10 @@ public void launchTest(JobConf conf, private static void checkEnv(String envName, String expValue, String mode) { String envValue = System.getenv(envName).trim(); if ("append".equals(mode)) { - if (envValue == null || !envValue.contains(":")) { + if (envValue == null || !envValue.contains(File.pathSeparator)) { throw new RuntimeException("Missing env variable"); } else { - String parts[] = envValue.split(":"); + String parts[] = envValue.split(File.pathSeparator); // check if the value is appended if (!parts[parts.length - 1].equals(expValue)) { throw new RuntimeException("Wrong env variable in append mode"); @@ -225,10 +226,10 @@ public void configure(JobConf job) { // check if X=/tmp for a new env variable checkEnv("MY_PATH", "/tmp", "noappend"); // check if X=$X:/tmp works for a new env var and results into :/tmp - checkEnv("NEW_PATH", ":/tmp", "noappend"); + checkEnv("NEW_PATH", File.pathSeparator + "/tmp", "noappend"); // check if X=$(tt's X var):/tmp for an old env variable inherited from // the tt - checkEnv("PATH", path + ":/tmp", "noappend"); + checkEnv("PATH", path + File.pathSeparator + "/tmp", "noappend"); String jobLocalDir = job.get(MRJobConfig.JOB_LOCAL_DIR); assertNotNull(MRJobConfig.JOB_LOCAL_DIR + " is null", @@ -279,10 +280,10 @@ public void configure(JobConf job) { // check if X=/tmp for a new env variable checkEnv("MY_PATH", "/tmp", "noappend"); // check if X=$X:/tmp works for a new env var and results into :/tmp - checkEnv("NEW_PATH", ":/tmp", "noappend"); + checkEnv("NEW_PATH", File.pathSeparator + "/tmp", "noappend"); // check if X=$(tt's X var):/tmp for an old env variable inherited from // the tt - checkEnv("PATH", path + ":/tmp", "noappend"); + checkEnv("PATH", path + File.pathSeparator + "/tmp", "noappend"); } @@ -437,12 +438,18 @@ void runTestTaskEnv(JobConf conf, Path inDir, Path outDir, boolean oldConfigs) mapTaskJavaOptsKey = reduceTaskJavaOptsKey = JobConf.MAPRED_TASK_JAVA_OPTS; mapTaskJavaOpts = reduceTaskJavaOpts = TASK_OPTS_VAL; } - conf.set(mapTaskEnvKey, - "MY_PATH=/tmp,LANG=en_us_8859_1,LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp," + - "PATH=$PATH:/tmp,NEW_PATH=$NEW_PATH:/tmp"); - conf.set(reduceTaskEnvKey, - "MY_PATH=/tmp,LANG=en_us_8859_1,LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp," + - "PATH=$PATH:/tmp,NEW_PATH=$NEW_PATH:/tmp"); + conf.set( + mapTaskEnvKey, + Shell.WINDOWS ? "MY_PATH=/tmp,LANG=en_us_8859_1,LD_LIBRARY_PATH=%LD_LIBRARY_PATH%;/tmp," + + "PATH=%PATH%;/tmp,NEW_PATH=%NEW_PATH%;/tmp" + : "MY_PATH=/tmp,LANG=en_us_8859_1,LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp," + + "PATH=$PATH:/tmp,NEW_PATH=$NEW_PATH:/tmp"); + conf.set( + reduceTaskEnvKey, + Shell.WINDOWS ? "MY_PATH=/tmp,LANG=en_us_8859_1,LD_LIBRARY_PATH=%LD_LIBRARY_PATH%;/tmp," + + "PATH=%PATH%;/tmp,NEW_PATH=%NEW_PATH%;/tmp" + : "MY_PATH=/tmp,LANG=en_us_8859_1,LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp," + + "PATH=$PATH:/tmp,NEW_PATH=$NEW_PATH:/tmp"); conf.set("path", System.getenv("PATH")); conf.set(mapTaskJavaOptsKey, mapTaskJavaOpts); conf.set(reduceTaskJavaOptsKey, reduceTaskJavaOpts); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java index ece11b4c2b7..a357734a14c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/Apps.java @@ -22,12 +22,16 @@ import static org.apache.hadoop.yarn.util.StringHelper.join; import static org.apache.hadoop.yarn.util.StringHelper.sjoin; +import java.io.File; import java.util.Iterator; import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.apache.hadoop.classification.InterfaceAudience.Private; import org.apache.hadoop.classification.InterfaceAudience.Public; import org.apache.hadoop.classification.InterfaceStability.Unstable; +import org.apache.hadoop.util.Shell; import org.apache.hadoop.util.StringInterner; import org.apache.hadoop.yarn.api.records.ApplicationId; import org.apache.hadoop.yarn.exceptions.YarnRuntimeException; @@ -69,41 +73,30 @@ public static void setEnvFromInputString(Map env, String envString) { if (envString != null && envString.length() > 0) { String childEnvs[] = envString.split(","); + Pattern p = Pattern.compile(Shell.getEnvironmentVariableRegex()); for (String cEnv : childEnvs) { String[] parts = cEnv.split("="); // split on '=' - String value = env.get(parts[0]); - - if (value != null) { - // Replace $env with the child's env constructed by NM's - // For example: LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/tmp - value = parts[1].replace("$" + parts[0], value); - } else { - // example PATH=$PATH:/tmp - value = System.getenv(parts[0]); - if (value != null) { - // the env key is present in the tt's env - value = parts[1].replace("$" + parts[0], value); - } else { - // check for simple variable substitution - // for e.g. ROOT=$HOME - String envValue = System.getenv(parts[1].substring(1)); - if (envValue != null) { - value = envValue; - } else { - // the env key is note present anywhere .. simply set it - // example X=$X:/tmp or X=/tmp - value = parts[1].replace("$" + parts[0], ""); - } - } + Matcher m = p.matcher(parts[1]); + StringBuffer sb = new StringBuffer(); + while (m.find()) { + String var = m.group(1); + // replace $env with the child's env constructed by tt's + String replace = env.get(var); + // if this key is not configured by the tt for the child .. get it + // from the tt's env + if (replace == null) + replace = System.getenv(var); + // the env key is note present anywhere .. simply set it + if (replace == null) + replace = ""; + m.appendReplacement(sb, Matcher.quoteReplacement(replace)); } - addToEnvironment(env, parts[0], value); + m.appendTail(sb); + addToEnvironment(env, parts[0], sb.toString()); } } } - private static final String SYSTEM_PATH_SEPARATOR = - System.getProperty("path.separator"); - @Public @Unstable public static void addToEnvironment( @@ -113,7 +106,7 @@ public static void addToEnvironment( if (val == null) { val = value; } else { - val = val + SYSTEM_PATH_SEPARATOR + value; + val = val + File.pathSeparator + value; } environment.put(StringInterner.weakIntern(variable), StringInterner.weakIntern(val));