Address reviewboard comments Change-Id: Ib33c9de3bf8de85de27ef03fef0491e475415f8a
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/523ec74e Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/523ec74e Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/523ec74e Branch: refs/heads/oya Commit: 523ec74e30ad4c03095acb86cd48eb761a3b493c Parents: 5768f93 Author: Gezapeti Cseh <[email protected]> Authored: Tue May 23 18:10:12 2017 +0200 Committer: Gezapeti Cseh <[email protected]> Committed: Tue May 23 18:11:26 2017 +0200 ---------------------------------------------------------------------- .../action/hadoop/HCatCredentialHelper.java | 4 ++-- .../oozie/action/hadoop/JavaActionExecutor.java | 10 ++++++++-- .../oozie/action/hadoop/ShellActionExecutor.java | 19 ------------------- .../oozie/action/hadoop/TestLauncherMapper.java | 8 ++++---- 4 files changed, 14 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/523ec74e/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentialHelper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentialHelper.java b/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentialHelper.java index 01bd989..9804c7b 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentialHelper.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/HCatCredentialHelper.java @@ -33,7 +33,7 @@ import org.apache.oozie.util.XLog; /** * Helper class to handle the HCat credentials * Performs internally the heavy-lifting of fetching delegation tokens from Hive Metastore, abstracted from the user - * Token is added to the launcher configuration + * Token is added to the credentials */ public class HCatCredentialHelper { @@ -45,7 +45,7 @@ public class HCatCredentialHelper { private static final String HADOOP_RPC_PROTECTION = "hadoop.rpc.protection"; /** - * This Function will set the HCat token to configuration + * This Function will set the HCat token to the credentials * @param credentials - the credentials * @param launcherConfig - launcher configuration * @param principal - principal for HCat server http://git-wip-us.apache.org/repos/asf/oozie/blob/523ec74e/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java index c879c90..7836c74 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java @@ -75,6 +75,7 @@ import org.apache.hadoop.yarn.api.records.YarnApplicationState; import org.apache.hadoop.yarn.client.api.YarnClient; import org.apache.hadoop.yarn.client.api.YarnClientApplication; import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.util.Apps; import org.apache.hadoop.yarn.util.ConverterUtils; import org.apache.hadoop.yarn.util.Records; import org.apache.oozie.WorkflowActionBean; @@ -956,7 +957,7 @@ public class JavaActionExecutor extends ActionExecutor { // if user-retry is on, always submit new launcher boolean isUserRetry = ((WorkflowActionBean)action).isUserRetry(); - LOG.debug("creating yarnClinet for action {0}", action.getId()); + LOG.debug("Creating yarnClient for action {0}", action.getId()); yarnClient = createYarnClient(context, launcherJobConf); if (alreadyRunning && !isUserRetry) { @@ -1084,7 +1085,7 @@ public class JavaActionExecutor extends ActionExecutor { // Set the command List<String> vargs = new ArrayList<String>(6); - vargs.add(MRApps.crossPlatformifyMREnv(launcherJobConf, ApplicationConstants.Environment.JAVA_HOME) + vargs.add(Apps.crossPlatformify(ApplicationConstants.Environment.JAVA_HOME.toString()) + "/bin/java"); vargs.add("-Dlog4j.configuration=container-log4j.properties"); @@ -1094,6 +1095,11 @@ public class JavaActionExecutor extends ActionExecutor { vargs.add("-Dhadoop.root.logger=INFO,CLA"); vargs.add("-Dhadoop.root.logfile=" + TaskLog.LogName.SYSLOG); vargs.add("-Dsubmitter.user=" + context.getWorkflow().getUser()); + + Path amTmpDir = new Path(Apps.crossPlatformify(ApplicationConstants.Environment.PWD.toString()), + YarnConfiguration.DEFAULT_CONTAINER_TEMP_DIR); + vargs.add("-Djava.io.tmpdir=" + amTmpDir); + vargs.add(LauncherAM.class.getCanonicalName()); vargs.add("1>" + ApplicationConstants.LOG_DIR_EXPANSION_VAR + Path.SEPARATOR + ApplicationConstants.STDOUT); http://git-wip-us.apache.org/repos/asf/oozie/blob/523ec74e/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java b/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java index 63b8722..c0b8a8d 100644 --- a/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java +++ b/core/src/main/java/org/apache/oozie/action/hadoop/ShellActionExecutor.java @@ -33,12 +33,6 @@ import org.jdom.Namespace; public class ShellActionExecutor extends JavaActionExecutor { - /** - * Config property name to set the child environment - */ - public String OOZIE_LAUNCHER_CHILD_ENV = "mapred.child.env"; - public String OOZIE_LAUNCHER_MAP_ENV = "mapreduce.map.env"; - public ShellActionExecutor() { super("shell"); } @@ -135,22 +129,9 @@ public class ShellActionExecutor extends JavaActionExecutor { protected Configuration setupLauncherConf(Configuration conf, Element actionXml, Path appPath, Context context) throws ActionExecutorException { super.setupLauncherConf(conf, actionXml, appPath, context); - addDefaultChildEnv(conf); return conf; } - /** - * This method sets the PATH to current working directory for the launched - * map task from where shell command will run. - * - * @param conf - */ - protected void addDefaultChildEnv(Configuration conf) { - String envValues = "PATH=.:$PATH"; - updateProperty(conf, OOZIE_LAUNCHER_MAP_ENV, envValues); - updateProperty(conf, OOZIE_LAUNCHER_CHILD_ENV, envValues); - } - @Override protected void addActionSpecificEnvVars(Map<String, String> env) { Apps.setEnvFromInputString(env, "PATH=.:$PATH", File.pathSeparator); http://git-wip-us.apache.org/repos/asf/oozie/blob/523ec74e/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMapper.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMapper.java b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMapper.java index 1dd8002..a0c77f7 100644 --- a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMapper.java +++ b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestLauncherMapper.java @@ -41,7 +41,7 @@ public class TestLauncherMapper { private Configuration conf; // we have to use mock, because conf.set(null) throws exception @Test - public void testLauncherMapperArgsHandlingWithoutNulls() { + public void testArgsHandlingWithoutNulls() { setupConf(Lists.newArrayList("a", "b", "c")); String args[] = LauncherMapper.getMainArguments(conf); @@ -50,7 +50,7 @@ public class TestLauncherMapper { } @Test - public void testLauncherMapperArgsHandlingWhenArgsContainNulls() { + public void testArgsHandlingWhenArgsContainNulls() { setupConf(Lists.newArrayList("a", null, "b", null, "c")); String args[] = LauncherMapper.getMainArguments(conf); @@ -59,7 +59,7 @@ public class TestLauncherMapper { } @Test - public void testLauncherMapperArgsHandlingWhenArgsContainsNullsOnly() { + public void testArgsHandlingWhenArgsContainsNullsOnly() { setupConf(Lists.<String>newArrayList(null, null, null)); String args[] = LauncherMapper.getMainArguments(conf); @@ -68,7 +68,7 @@ public class TestLauncherMapper { } @Test - public void testLauncherMapperArgsHandlingWhenArgsContainsOneNull() { + public void testArgsHandlingWhenArgsContainsOneNull() { setupConf(Lists.<String>newArrayList((String) null)); String args[] = LauncherMapper.getMainArguments(conf);
