You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by pb...@apache.org on 2016/12/13 13:19:54 UTC
[23/48] oozie git commit: OOZIE-2729 change JT to RM in methods
OOZIE-2729 change JT to RM in methods
Change-Id: I42f305b8e24bb7f37c5c8b032e9eff67dc3b4027
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/ddbd90f8
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/ddbd90f8
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/ddbd90f8
Branch: refs/heads/oya
Commit: ddbd90f88c511a714c35c39aedbce0ab2624724d
Parents: 3b6daff
Author: Peter Cseh <ge...@cloudera.com>
Authored: Tue Nov 22 14:54:00 2016 +0100
Committer: Peter Cseh <ge...@cloudera.com>
Committed: Tue Nov 22 14:54:00 2016 +0100
----------------------------------------------------------------------
.../action/hadoop/TestDistCpActionExecutor.java | 2 +-
.../action/hadoop/TestJavaActionExecutor.java | 99 ++++++++++----------
.../oozie/action/hadoop/TestLauncher.java | 2 +-
.../oozie/action/hadoop/TestOozieJobInfo.java | 4 +-
.../apache/oozie/action/hadoop/TestRerun.java | 2 +-
.../action/hadoop/TestShellActionExecutor.java | 20 ++--
.../oozie/action/hadoop/TestShellMain.java | 2 +-
.../oozie/TestSubWorkflowActionExecutor.java | 4 +-
.../coord/TestCoordActionStartXCommand.java | 2 +-
.../command/coord/TestCoordRerunXCommand.java | 6 +-
.../command/wf/TestActionCheckXCommand.java | 6 +-
.../command/wf/TestActionStartXCommand.java | 8 +-
.../oozie/command/wf/TestReRunXCommand.java | 2 +-
.../oozie/command/wf/TestSubmitXCommand.java | 2 +-
.../wf/TestWorkflowActionKillXCommand.java | 2 +-
.../apache/oozie/event/TestEventGeneration.java | 2 +-
.../TestCoordJobsGetForPurgeJPAExecutor.java | 2 +-
...estCoordJobsToBeMaterializedJPAExecutor.java | 2 +-
.../service/TestHadoopAccessorService.java | 12 +--
.../oozie/service/TestRecoveryService.java | 2 +-
.../oozie/service/TestShareLibService.java | 14 +--
.../org/apache/oozie/test/TestXTestCase.java | 2 +-
.../org/apache/oozie/test/XDataTestCase.java | 10 +-
.../java/org/apache/oozie/test/XFsTestCase.java | 4 +-
.../java/org/apache/oozie/test/XTestCase.java | 28 +++---
.../action/hadoop/TestHiveActionExecutor.java | 13 +--
.../action/hadoop/TestHive2ActionExecutor.java | 15 +--
.../action/hadoop/TestPigActionExecutor.java | 8 +-
.../apache/oozie/action/hadoop/TestPyspark.java | 8 +-
.../action/hadoop/TestSparkActionExecutor.java | 13 +--
.../action/hadoop/TestSqoopActionExecutor.java | 17 +---
.../hadoop/TestMapReduceActionExecutor.java | 44 ++++-----
32 files changed, 157 insertions(+), 202 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
index c1f0e6f..c953bb8 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
@@ -50,7 +50,7 @@ public class TestDistCpActionExecutor extends ActionExecutorTestCase{
os.close();
String actionXml = "<distcp>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<arg>" + inputPath + "</arg>"+
"<arg>" + outputPath + "</arg>" +
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
index bfc8ab4..2b31207 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
@@ -44,7 +44,6 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
-import org.apache.hadoop.yarn.api.records.YarnApplicationState;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.action.ActionExecutor;
@@ -87,7 +86,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
setSystemProperty("oozie.service.ActionService.executor.classes", JavaActionExecutor.class.getName());
setSystemProperty("oozie.service.HadoopAccessorService.action.configurations",
- "*=hadoop-conf," + getJobTrackerUri() + "=action-conf");
+ "*=hadoop-conf," + getResourceManagerUri() + "=action-conf");
setSystemProperty(WorkflowAppService.SYSTEM_LIB_PATH, getFsTestCaseDir().toUri().getPath() + "/systemlib");
new File(getTestCaseConfDir(), "action-conf").mkdir();
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("test-action-config.xml");
@@ -135,7 +134,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
fail();
}
- Element actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ Element actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<job-xml>job.xml</job-xml>" + "<job-xml>job2.xml</job-xml>" + "<configuration>" +
"<property><name>oozie.launcher.a</name><value>LA</value></property>" +
@@ -196,7 +195,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
conf = ae.createBaseHadoopConf(context, actionXml);
assertEquals(protoConf.get(WorkflowAppService.HADOOP_USER), conf.get(WorkflowAppService.HADOOP_USER));
- assertEquals(getJobTrackerUri(), conf.get("yarn.resourcemanager.address"));
+ assertEquals(getResourceManagerUri(), conf.get("yarn.resourcemanager.address"));
assertEquals(getNameNodeUri(), conf.get("fs.default.name"));
conf = ae.createBaseHadoopConf(context, actionXml);
@@ -268,7 +267,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
// FIXME - this file exists - must use the correct path
// assertTrue(getFileSystem().exists(new Path(context.getActionDir(), LauncherMapper.ACTION_CONF_XML)));
- actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"<property><name>mapred.job.queue.name</name><value>AQ</value></property>" +
"<property><name>oozie.action.sharelib.for.java</name><value>sharelib-java</value></property>" +
@@ -281,7 +280,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertEquals("AQ", actionConf.get("mapred.job.queue.name"));
assertEquals("sharelib-java", actionConf.get("oozie.action.sharelib.for.java"));
- actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"<property><name>oozie.launcher.mapred.job.queue.name</name><value>LQ</value></property>" +
"</configuration>" + "<main-class>MAIN-CLASS</main-class>" +
@@ -291,7 +290,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
conf = ae.createLauncherConf(getFileSystem(), context, action, actionXml, actionConf);
assertEquals("LQ", conf.get("mapred.job.queue.name"));
- actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ actionXml = XmlUtils.parseXml("<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"<property><name>oozie.launcher.mapred.job.queue.name</name><value>LQ</value></property>" +
"<property><name>mapred.job.queue.name</name><value>AQ</value></property>" +
@@ -354,7 +353,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testSimpestSleSubmitOK() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"</java>";
@@ -372,7 +371,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testOutputSubmitOK() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"<arg>out</arg>" +
@@ -397,7 +396,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testIdSwapSubmitOK() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"<arg>id</arg>" +
@@ -426,7 +425,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
IOUtils.copyStream(is, os);
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester2.class.getName() + "</main-class>" +
"<file>" + appJarPath.toString() + "</file>" +
@@ -447,7 +446,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testExit0SubmitOK() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"<arg>exit0</arg>" +
@@ -468,7 +467,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testExit1SubmitError() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"<arg>exit1</arg>" +
@@ -491,7 +490,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testExceptionSubmitException() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"<arg>exception</arg>" +
@@ -513,7 +512,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testExceptionSubmitThrowable() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"<arg>throwable</arg>" +
@@ -535,7 +534,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testKill() throws Exception {
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"</java>";
@@ -552,7 +551,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testRecovery() throws Exception {
final String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + LauncherMainTester.class.getName() + "</main-class>" +
"</java>";
@@ -612,7 +611,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
getFileSystem().create(rootArchive).close();
String actionXml = "<java>" +
- " <job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ " <job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
" <name-node>" + getNameNodeUri() + "</name-node>" +
" <main-class>CLASS</main-class>" +
" <file>" + jar.toString() + "</file>\n" +
@@ -720,7 +719,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
getFileSystem().create(rootArchive).close();
String actionXml = "<java>" +
- " <job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ " <job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
" <name-node>" + getNameNodeUri() + "</name-node>" +
" <main-class>CLASS</main-class>" +
" <file>" + jar.toString() +
@@ -802,7 +801,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
fs.mkdirs(delete);
String actionXml = "<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<prepare>" +
"<mkdir path='" + mkdir + "'/>" +
@@ -1190,7 +1189,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
}
public void testJavaOpts() throws Exception {
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ "<configuration>" + "<property><name>oozie.launcher.a</name><value>LA</value></property>"
+ "<property><name>a</name><value>AA</value></property>"
@@ -1216,7 +1215,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertEquals("-Xmx200m JAVA-OPT1 JAVA-OPT2", conf.get("mapred.child.java.opts"));
assertEquals("-Xmx200m JAVA-OPT1 JAVA-OPT2", conf.get("mapreduce.map.java.opts"));
- actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ "<configuration>" + "<property><name>oozie.launcher.a</name><value>LA</value></property>"
+ "<property><name>a</name><value>AA</value></property>"
@@ -1241,7 +1240,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertEquals("-Xmx200m JAVA-OPT1 JAVA-OPT2", conf.get("mapred.child.java.opts"));
assertEquals("-Xmx200m JAVA-OPT1 JAVA-OPT2", conf.get("mapreduce.map.java.opts"));
- actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ "<configuration>" + "<property><name>oozie.launcher.a</name><value>LA</value></property>"
+ "<property><name>a</name><value>AA</value></property>"
@@ -1268,7 +1267,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertEquals("JAVA-OPT3 JAVA-OPT1 JAVA-OPT2", conf.get("mapred.child.java.opts"));
assertEquals("JAVA-OPT3 JAVA-OPT1 JAVA-OPT2", conf.get("mapreduce.map.java.opts"));
- actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ "<configuration>" + "<property><name>oozie.launcher.a</name><value>LA</value></property>"
+ "<property><name>a</name><value>AA</value></property>"
@@ -1295,7 +1294,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertEquals("-Xmx200m JAVA-OPT3 JAVA-OPT1 JAVA-OPT2", conf.get("mapred.child.java.opts"));
assertEquals("-Xmx200m JAVA-OPT3 JAVA-OPT1 JAVA-OPT2", conf.get("mapreduce.map.java.opts"));
- actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ "<configuration>" + "<property><name>oozie.launcher.a</name><value>LA</value></property>"
+ "<property><name>a</name><value>AA</value></property>"
@@ -1333,7 +1332,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
Path jar2Path = new Path(actionLibPath, "jar2.jar");
getFileSystem().create(jar2Path).close();
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" + "<configuration>" +
"<property><name>oozie.launcher.oozie.libpath</name><value>" + actionLibPath + "</value></property>" +
"</configuration>" + "<main-class>MAIN-CLASS</main-class>" +
@@ -1356,7 +1355,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
Path jar3Path = new Path(getFsTestCaseDir(), "jar3.jar");
getFileSystem().create(jar3Path).close();
- actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" + "<configuration>" +
"<property><name>oozie.launcher.oozie.libpath</name><value>" + jar3Path + "</value></property>" +
"</configuration>" + "<main-class>MAIN-CLASS</main-class>" +
@@ -1375,7 +1374,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
assertTrue(cacheFilesStr.contains(jar3Path.toString()));
// Test adding a directory and a file (comma separated)
- actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" + "<configuration>" +
"<property><name>oozie.launcher.oozie.libpath</name><value>" + actionLibPath + "," + jar3Path +
"</value></property>" +
@@ -1424,7 +1423,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
Path jar5Path = new Path(otherShareLibPath, "jar5.jar");
getFileSystem().create(jar5Path).close();
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>MAIN-CLASS</main-class>" +
"</java>";
@@ -1504,7 +1503,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
return "java-action-executor";
}
};
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNode2Uri() + "</name-node>" + "<main-class>" + LauncherMainTester.class.getName()
+ "</main-class>" + "</java>";
Element eActionXml = XmlUtils.parseXml(actionXml);
@@ -1539,7 +1538,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testFilesystemScheme() throws Exception {
try {
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<main-class>" + LauncherMainTester.class.getName()
+ "</main-class>" + "</java>";
Element eActionXml = XmlUtils.parseXml(actionXml);
@@ -1562,7 +1561,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testACLDefaults_launcherACLsSetToDefault() throws Exception {
// CASE: launcher specific ACLs not configured - set defaults
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"<property><name>mapreduce.job.acl-view-job</name><value>VIEWER</value></property>" +
"<property><name>mapreduce.job.acl-modify-job</name><value>MODIFIER</value></property>" +
@@ -1587,7 +1586,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testACLDefaults_noFalseChange() throws Exception {
// CASE: launcher specific ACLs configured, but MR job ACLs not configured i.e. null. Check for no false changes to null
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"<property><name>oozie.launcher.mapreduce.job.acl-view-job</name><value>V</value></property>" +
"<property><name>oozie.launcher.mapreduce.job.acl-modify-job</name><value>M</value></property>" +
@@ -1612,7 +1611,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testACLDefaults_explicitLauncherAndActionSettings() throws Exception {
// CASE: launcher specific ACLs configured, as well as MR job ACLs configured. Check that NO overriding with defaults
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"<property><name>oozie.launcher.mapreduce.job.acl-view-job</name><value>V</value></property>" +
"<property><name>oozie.launcher.mapreduce.job.acl-modify-job</name><value>M</value></property>" +
@@ -1640,7 +1639,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testACLModifyJob() throws Exception {
// CASE 1: If user has provided modify-acl value
// then it should NOT be overridden by group name
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"<property><name>mapreduce.job.acl-modify-job</name><value>MODIFIER</value></property>" +
"</configuration>" + "<main-class>MAIN-CLASS</main-class>" +
@@ -1657,7 +1656,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
// CASE 2: If user has not provided modify-acl value
// then it equals group name
- actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node> <configuration>" +
"</configuration>" + "<main-class>MAIN-CLASS</main-class>" +
"</java>";
@@ -1789,7 +1788,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
//Test UpdateCOnfForJavaTmpDir for launcherConf
String actionXml1 = "<java>"
+ "<job-tracker>"
- + getJobTrackerUri()
+ + getResourceManagerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1825,7 +1824,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
//Test UpdateConfForJavaTmpDIr for actionConf
String actionXml = "<java>"
+ "<job-tracker>"
- + getJobTrackerUri()
+ + getResourceManagerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1853,7 +1852,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
Element actionXml = XmlUtils
.parseXml("<java>"
+ "<job-tracker>"
- + getJobTrackerUri()
+ + getResourceManagerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1887,7 +1886,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
Element actionXmlWithTez = XmlUtils
.parseXml("<java>"
+ "<job-tracker>"
- + getJobTrackerUri()
+ + getResourceManagerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1903,7 +1902,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
Element actionXmlATSDisabled = XmlUtils
.parseXml("<java>"
+ "<job-tracker>"
- + getJobTrackerUri()
+ + getResourceManagerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -2080,7 +2079,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
// (first should be used)
// 4. Fully qualified path located in the second filesystem
String str = "<java>"
- + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>"
+ "<name-node>" + getNameNode2Uri() + "</name-node>"
+ "<job-xml>" + jobXmlAbsolutePath.toString() + "</job-xml>"
+ "<job-xml>job2.xml</job-xml>"
@@ -2170,7 +2169,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
is = new FileInputStream(jarFile);
IOUtils.copyStream(is, os3);
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNode2Uri() + "</name-node>" +
"<job-xml>job.xml</job-xml>" +
"<main-class>"+ LauncherMainTester.class.getName() + "</main-class>" +
@@ -2213,7 +2212,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
w.write("A = load '$INPUT' using PigStorage(':');\n");
w.write("store B into '$OUTPUT' USING PigStorage();\n");
w.close();
- String actionXml = "<pig>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<pig>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<prepare>" + "<delete path='outputdir' />" + "</prepare>"
+ "<configuration>" + "<property>" + "<name>mapred.compress.map.output</name>" + "<value>true</value>"
+ "</property>" + "<property>" + "<name>mapred.job.queue.name</name>" + "<value>default</value>"
@@ -2237,7 +2236,7 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
public void testDefaultConfigurationInLauncher() throws Exception {
JavaActionExecutor ae = new JavaActionExecutor();
Element actionXmlWithConfiguration = XmlUtils.parseXml(
- "<java>" + "<job-tracker>" + getJobTrackerUri() +"</job-tracker>" +
+ "<java>" + "<job-tracker>" + getResourceManagerUri() +"</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<configuration>" +
"<property><name>oozie.launcher.a</name><value>AA</value></property>" +
@@ -2246,16 +2245,16 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
"<main-class>MAIN-CLASS</main-class>" +
"</java>");
Element actionXmlWithoutConfiguration = XmlUtils.parseXml(
- "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>MAIN-CLASS</main-class>" +
"</java>");
Configuration conf = new Configuration(false);
Assert.assertEquals(0, conf.size());
- conf.set("yarn.resourcemanager.address", getJobTrackerUri());
+ conf.set("yarn.resourcemanager.address", getResourceManagerUri());
ae.setupLauncherConf(conf, actionXmlWithConfiguration, null, null);
- assertEquals(getJobTrackerUri(), conf.get("yarn.resourcemanager.address"));
+ assertEquals(getResourceManagerUri(), conf.get("yarn.resourcemanager.address"));
assertEquals("AA", conf.get("oozie.launcher.a"));
assertEquals("AA", conf.get("a"));
assertEquals("action.barbar", conf.get("oozie.launcher.action.foofoo"));
@@ -2264,9 +2263,9 @@ public class TestJavaActionExecutor extends ActionExecutorTestCase {
conf = new Configuration(false);
Assert.assertEquals(0, conf.size());
- conf.set("yarn.resourcemanager.address", getJobTrackerUri());
+ conf.set("yarn.resourcemanager.address", getResourceManagerUri());
ae.setupLauncherConf(conf, actionXmlWithoutConfiguration, null, null);
- assertEquals(getJobTrackerUri(), conf.get("yarn.resourcemanager.address"));
+ assertEquals(getResourceManagerUri(), conf.get("yarn.resourcemanager.address"));
assertEquals("action.barbar", conf.get("oozie.launcher.action.foofoo"));
assertEquals("action.barbar", conf.get("action.foofoo"));
assertEquals(3, conf.size());
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
index e7b9534..1005274 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
@@ -79,7 +79,7 @@ public class TestLauncher extends XFsTestCase {
jobConf.setInt("mapred.reduce.max.attempts", 1);
jobConf.set("mapreduce.framework.name", "yarn");
- jobConf.set("mapred.job.tracker", getJobTrackerUri());
+ jobConf.set("mapred.job.tracker", getResourceManagerUri());
jobConf.set("fs.default.name", getNameNodeUri());
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/hadoop/TestOozieJobInfo.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestOozieJobInfo.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestOozieJobInfo.java
index 9efacdd..d3dd377 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestOozieJobInfo.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestOozieJobInfo.java
@@ -202,7 +202,7 @@ public class TestOozieJobInfo extends XDataTestCase {
writer2.write(APP1);
writer2.close();
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set("myJobTracker", getJobTrackerUri());
+ jobConf.set("myJobTracker", getResourceManagerUri());
jobConf.set("myNameNode", getNameNodeUri());
jobConf.set("wfAppPath", new Path(wfAppPath, "workflow.xml").toString());
jobConf.set("mrclass", MapperReducerForTest.class.getName());
@@ -239,7 +239,7 @@ public class TestOozieJobInfo extends XDataTestCase {
Configuration conf = new XConfiguration();
conf.set(OozieClient.BUNDLE_APP_PATH, bundleAppPath.toString());
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set("jobTracker", getJobTrackerUri());
+ conf.set("jobTracker", getResourceManagerUri());
conf.set("nameNode", getNameNodeUri());
conf.set("appName", "bundle-app-name");
conf.set("start", "2009-02-01T00:00Z");
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/hadoop/TestRerun.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestRerun.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestRerun.java
index cf9ce1b..fbb0512 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestRerun.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestRerun.java
@@ -90,7 +90,7 @@ public class TestRerun extends XFsTestCase {
final OozieClient wfClient = LocalOozie.getClient();
Properties conf = wfClient.createConfiguration();
conf.setProperty(OozieClient.APP_PATH, new Path(appPath, "workflow.xml").toString());
- conf.setProperty("jobTracker", getJobTrackerUri());
+ conf.setProperty("jobTracker", getResourceManagerUri());
conf.setProperty("nameNode", getNameNodeUri());
conf.setProperty("mrclass", MapperReducerForTest.class.getName());
conf.setProperty("input", input.toString());
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
index 931307e..fa13548 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
@@ -26,16 +26,10 @@ import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.RunningJob;
import org.apache.hadoop.util.Shell;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.WorkflowAction;
-import org.apache.oozie.service.ActionService;
-import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.PropertiesUtils;
@@ -81,7 +75,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
public void testSetupMethods() throws Exception {
ShellActionExecutor ae = new ShellActionExecutor();
assertNull(ae.getLauncherClasses());
- Element actionXml = XmlUtils.parseXml("<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ Element actionXml = XmlUtils.parseXml("<shell>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>"
+ "<name-node>" + getNameNodeUri() + "</name-node>" + "<exec>SCRIPT</exec>"
+ "<argument>a=A</argument>" + "<argument>b=B</argument>" + "</shell>");
@@ -123,7 +117,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
w.close();
// Create sample Shell action xml
- String actionXml = "<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<shell>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<exec>" + SHELL_EXEC + "</exec>" + "<argument>" + SHELL_PARAM + "</argument>"
+ "<argument>" + SHELL_SCRIPTNAME + "</argument>" + "<argument>A</argument>" + "<argument>B</argument>"
+ "<env-var>var1=val1</env-var>" + "<env-var>var2=val2</env-var>" + "<file>" + script.toString()
@@ -149,7 +143,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
w.close();
// Create sample Shell action xml
- String actionXml = "<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<shell>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>oozie.action.shell.setup.hadoop.conf.dir</name><value>true</value></property>"
+ "</configuration>" + "<exec>" + SHELL_EXEC + "</exec>" + "<argument>" + SHELL_PARAM + "</argument>"
@@ -193,7 +187,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
w.close();
// Create sample Shell action xml
- String actionXml = "<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<shell>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>oozie.action.shell.setup.hadoop.conf.dir</name><value>true</value></property>"
+ "<property><name>oozie.action.shell.setup.hadoop.conf.dir.write.log4j.properties"
@@ -223,7 +217,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
w.close();
// Create sample shell action xml
- String actionXml = "<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<shell>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<exec>" + SHELL_EXEC + "</exec>" + "<argument>" + SHELL_PARAM + "</argument>"
+ "<argument>" + SHELL_SCRIPTNAME + "</argument>" + "<argument>A</argument>" + "<argument>B</argument>" + "<file>"
+ script.toString() + "#" + script.getName() + "</file>" + "</shell>";
@@ -249,7 +243,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
w.write(PERL_SCRIPT_CONTENT);
w.close();
// Create a Sample Shell action using the perl script
- String actionXml = "<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<shell>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<exec>perl</exec>" + "<argument>script.pl</argument>"
+ "<argument>A</argument>" + "<argument>B</argument>" + "<env-var>my_var1=my_val1</env-var>" + "<file>"
+ script.toString() + "#" + script.getName() + "</file>" + "<capture-output/>" + "</shell>";
@@ -276,7 +270,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
String envValueHavingEqualSign = "a=b;c=d";
// Create sample shell action xml
- String actionXml = "<shell>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<shell>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<exec>" + SHELL_EXEC + "</exec>" + "<argument>" + SHELL_PARAM + "</argument>"
+ "<argument>" + SHELL_SCRIPTNAME + "</argument>" + "<argument>A</argument>" + "<argument>B</argument>"
+ "<env-var>var1=val1</env-var>" + "<env-var>var2=" + envValueHavingEqualSign + "</env-var>" + "<file>" + script.toString()
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/hadoop/TestShellMain.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellMain.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellMain.java
index d184a5a..eb442f0 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellMain.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellMain.java
@@ -47,7 +47,7 @@ public class TestShellMain extends ShellTestCase {
jobConf.setInt("mapred.map.tasks", 1);
jobConf.setInt("mapred.map.max.attempts", 1);
jobConf.setInt("mapred.reduce.max.attempts", 1);
- jobConf.set("mapred.job.tracker", getJobTrackerUri());
+ jobConf.set("mapred.job.tracker", getResourceManagerUri());
jobConf.set("fs.default.name", getNameNodeUri());
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java b/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
index e074d48..f5c7c2e 100644
--- a/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
@@ -559,7 +559,7 @@ public class TestSubWorkflowActionExecutor extends ActionExecutorTestCase {
"<start to='java' />" +
" <action name='java'>" +
"<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + JavaSleepAction.class.getName() + "</main-class>" +
"<arg>exit0</arg>" +
@@ -850,7 +850,7 @@ public class TestSubWorkflowActionExecutor extends ActionExecutorTestCase {
"<start to='java' />" +
"<action name='java'>" +
"<java>" +
- " <job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ " <job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
" <name-node>" + getNameNodeUri() + "</name-node>" +
" <configuration>" +
" <property>" +
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
index db66c72..172479b 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordActionStartXCommand.java
@@ -198,7 +198,7 @@ public class TestCoordActionStartXCommand extends XDataTestCase {
jobConf.setProperty(OozieClient.COORDINATOR_APP_PATH, coordAppPath.toString());
jobConf.setProperty(OozieClient.USER_NAME, getTestUser());
jobConf.setProperty(OozieClient.GROUP_NAME, getTestGroup());
- jobConf.setProperty("myJobTracker", getJobTrackerUri());
+ jobConf.setProperty("myJobTracker", getResourceManagerUri());
jobConf.setProperty("myNameNode", getNameNodeUri());
jobConf.setProperty("wfAppPath", new Path(wfAppPath, "workflow.xml").toString());
jobConf.setProperty("mrclass", MapperReducerForTest.class.getName());
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
index 6ae0ae2..d956b6c 100644
--- a/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/coord/TestCoordRerunXCommand.java
@@ -1083,7 +1083,7 @@ public class TestCoordRerunXCommand extends XDataTestCase {
final OozieClient coordClient = LocalOozie.getCoordClient();
Properties conf = coordClient.createConfiguration();
conf.setProperty(OozieClient.COORDINATOR_APP_PATH, appPath.toString());
- conf.setProperty("jobTracker", getJobTrackerUri());
+ conf.setProperty("jobTracker", getResourceManagerUri());
conf.setProperty("nameNode", getNameNodeUri());
conf.setProperty("wfAppPath", wfAppPath.toString());
conf.remove("user.name");
@@ -1293,7 +1293,7 @@ public class TestCoordRerunXCommand extends XDataTestCase {
final OozieClient coordClient = LocalOozie.getCoordClient();
Properties conf = coordClient.createConfiguration();
conf.setProperty(OozieClient.COORDINATOR_APP_PATH, appPath.toString());
- conf.setProperty("jobTracker", getJobTrackerUri());
+ conf.setProperty("jobTracker", getResourceManagerUri());
conf.setProperty("nameNode", getNameNodeUri());
conf.setProperty("wfAppPath", wfAppPath.toString());
conf.remove("user.name");
@@ -1306,7 +1306,7 @@ public class TestCoordRerunXCommand extends XDataTestCase {
"<start to='java' />" +
" <action name='java'>" +
"<java>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<main-class>" + JavaSleepAction.class.getName() + "</main-class>" +
"<arg>exit0</arg>" +
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
index 135c34a..4151182 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
@@ -368,7 +368,7 @@ public class TestActionCheckXCommand extends XDataTestCase {
// At this point, the launcher job has started (but not finished)
// Now, shutdown the job tracker to pretend it has gone down during the launcher job
- executeWhileJobTrackerIsShutdown(new ShutdownJobTrackerExecutable() {
+ executeWhileResourceManagerIsShutdown(new ShutdownResourceManagerExecutable() {
@Override
public void execute() throws Exception {
assertEquals(0, action1.getRetries());
@@ -505,7 +505,7 @@ public class TestActionCheckXCommand extends XDataTestCase {
// At this point, the launcher job has finished and the map-reduce action has started (but not finished)
// Now, shutdown the job tracker to pretend it has gone down during the map-reduce job
- executeWhileJobTrackerIsShutdown(new ShutdownJobTrackerExecutable() {
+ executeWhileResourceManagerIsShutdown(new ShutdownResourceManagerExecutable() {
@Override
public void execute() throws Exception {
assertEquals(0, action1.getRetries());
@@ -647,7 +647,7 @@ public class TestActionCheckXCommand extends XDataTestCase {
w.close();
String actionXml = "<map-reduce>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<prepare><delete path=\"" + outputDir.toString() + "\"/></prepare>" +
"<configuration>" +
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
index 59cfdd2..7c7ea5e 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
@@ -28,7 +28,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
@@ -48,7 +47,6 @@ import org.apache.oozie.executor.jpa.WorkflowActionQueryExecutor.WorkflowActionQ
import org.apache.oozie.executor.jpa.WorkflowJobInsertJPAExecutor;
import org.apache.oozie.executor.jpa.WorkflowJobQueryExecutor;
import org.apache.oozie.executor.jpa.WorkflowJobQueryExecutor.WorkflowJobQuery;
-import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.InstrumentationService;
import org.apache.oozie.service.JPAService;
import org.apache.oozie.service.LiteWorkflowStoreService;
@@ -331,7 +329,7 @@ public class TestActionStartXCommand extends XDataTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>mapred.mapper.class</name><value>" + MapperReducerForTest.class.getName()
+ "</value></property>" +
@@ -417,7 +415,7 @@ public class TestActionStartXCommand extends XDataTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>mapred.mapper.class</name><value>" + MapperReducerForTest.class.getName()
+ "</value></property>" + "<property><name>mapred.reducer.class</name><value>"
@@ -524,7 +522,7 @@ public class TestActionStartXCommand extends XDataTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>mapred.mapper.class</name><value>" + MapperReducerForTest.class.getName()
+ "</value></property>" + "<property><name>mapred.reducer.class</name><value>"
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
index 45cbbc4..298dd1e 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestReRunXCommand.java
@@ -144,7 +144,7 @@ public class TestReRunXCommand extends XDataTestCase {
final OozieClient wfClient = LocalOozie.getClient();
Properties conf = wfClient.createConfiguration();
conf.setProperty("nameNode", getNameNodeUri());
- conf.setProperty("jobTracker", getJobTrackerUri());
+ conf.setProperty("jobTracker", getResourceManagerUri());
conf.setProperty(OozieClient.APP_PATH, getTestCaseFileUri("workflow.xml"));
conf.setProperty(OozieClient.USER_NAME, getTestUser());
conf.setProperty("cmd4", "echo1"); //expected to fail
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
index 47ff8ca..c1e2a5b 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestSubmitXCommand.java
@@ -345,7 +345,7 @@ public class TestSubmitXCommand extends XDataTestCase {
writeToFile(wfXml, workflowUri);
Configuration conf = new XConfiguration();
conf.set("nameNode", getNameNodeUri());
- conf.set("jobTracker", getJobTrackerUri());
+ conf.set("jobTracker", getResourceManagerUri());
conf.set("foobarRef", "foobarRef");
conf.set("key", "job_prop_value");
conf.set(OozieClient.APP_PATH, workflowUri);
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionKillXCommand.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionKillXCommand.java b/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionKillXCommand.java
index ef75f14..4509586 100644
--- a/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionKillXCommand.java
+++ b/core/src/test/java/org/apache/oozie/command/wf/TestWorkflowActionKillXCommand.java
@@ -132,7 +132,7 @@ public class TestWorkflowActionKillXCommand extends XDataTestCase {
action.setExternalChildIDs(childID);
String actionXml = "<map-reduce>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<configuration>" +
"<property><name>mapred.mapper.class</name><value>" + MapperReducerForTest.class.getName() +
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java b/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
index 59d0420..6fd033f 100644
--- a/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
+++ b/core/src/test/java/org/apache/oozie/event/TestEventGeneration.java
@@ -707,7 +707,7 @@ public class TestEventGeneration extends XDataTestCase {
action.setLastCheckTime(new Date());
action.setPendingOnly();
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<main-class>" + "${dummy}" + "</java>";
action.setConf(actionXml);
jpaService.execute(new WorkflowActionInsertJPAExecutor(action));
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java b/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
index 39bbee4..6d6acb4 100644
--- a/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
+++ b/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsGetForPurgeJPAExecutor.java
@@ -177,7 +177,7 @@ public class TestCoordJobsGetForPurgeJPAExecutor extends XFsTestCase {
final OozieClient coordClient = LocalOozie.getCoordClient();
Properties conf = coordClient.createConfiguration();
conf.setProperty(OozieClient.COORDINATOR_APP_PATH, appPath.toString());
- conf.setProperty("jobTracker", getJobTrackerUri());
+ conf.setProperty("jobTracker", getResourceManagerUri());
conf.setProperty("nameNode", getNameNodeUri());
conf.setProperty("wfAppPath", wfAppPath.toString());
conf.remove("user.name");
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java b/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
index 3b72ecd..cd6c35f 100644
--- a/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
+++ b/core/src/test/java/org/apache/oozie/executor/jpa/TestCoordJobsToBeMaterializedJPAExecutor.java
@@ -165,7 +165,7 @@ public class TestCoordJobsToBeMaterializedJPAExecutor extends XFsTestCase {
final OozieClient coordClient = LocalOozie.getCoordClient();
Properties conf = coordClient.createConfiguration();
conf.setProperty(OozieClient.COORDINATOR_APP_PATH, appPath.toString());
- conf.setProperty("jobTracker", getJobTrackerUri());
+ conf.setProperty("jobTracker", getResourceManagerUri());
conf.setProperty("nameNode", getNameNodeUri());
conf.setProperty("wfAppPath", wfAppPath.toString());
conf.remove("user.name");
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java b/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
index e671b7a..6ded256 100644
--- a/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
@@ -20,13 +20,11 @@ package org.apache.oozie.service;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.ipc.RemoteException;
-import org.apache.hadoop.security.authorize.*;
import org.apache.hadoop.security.authorize.AuthorizationException;
import org.apache.hadoop.yarn.api.records.LocalResource;
import org.apache.hadoop.yarn.api.records.LocalResourceType;
import org.apache.hadoop.yarn.api.records.LocalResourceVisibility;
import org.apache.hadoop.yarn.client.api.YarnClient;
-import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.util.ConverterUtils;
import org.apache.oozie.test.XFsTestCase;
import org.apache.hadoop.mapred.JobConf;
@@ -154,7 +152,7 @@ public class TestHadoopAccessorService extends XFsTestCase {
public void testCreateJobClient() throws Exception {
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
- JobConf conf = has.createJobConf(getJobTrackerUri());
+ JobConf conf = has.createJobConf(getResourceManagerUri());
JobClient jc = has.createJobClient(getTestUser(), conf);
assertNotNull(jc);
@@ -169,7 +167,7 @@ public class TestHadoopAccessorService extends XFsTestCase {
}
JobConf conf2 = new JobConf(false);
- conf2.set("mapred.job.tracker", getJobTrackerUri());
+ conf2.set("mapred.job.tracker", getResourceManagerUri());
try {
has.createJobClient(getTestUser(), conf2);
fail("Should have thrown exception because Configuration not created by HadoopAccessorService");
@@ -181,7 +179,7 @@ public class TestHadoopAccessorService extends XFsTestCase {
public void testCreateYarnClient() throws Exception {
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
- JobConf conf = has.createJobConf(getJobTrackerUri());
+ JobConf conf = has.createJobConf(getResourceManagerUri());
YarnClient yc = has.createYarnClient(getTestUser(), conf);
assertNotNull(yc);
@@ -197,7 +195,7 @@ public class TestHadoopAccessorService extends XFsTestCase {
}
JobConf conf2 = new JobConf(false);
- conf2.set("yarn.resourcemanager.address", getJobTrackerUri());
+ conf2.set("yarn.resourcemanager.address", getResourceManagerUri());
try {
has.createYarnClient(getTestUser(), conf2);
fail("Should have thrown exception because Configuration not created by HadoopAccessorService");
@@ -209,7 +207,7 @@ public class TestHadoopAccessorService extends XFsTestCase {
public void testCreateFileSystem() throws Exception {
HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
- JobConf conf = has.createJobConf(getJobTrackerUri());
+ JobConf conf = has.createJobConf(getResourceManagerUri());
FileSystem fs = has.createFileSystem(getTestUser(), new URI(getNameNodeUri()), conf);
assertNotNull(fs);
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java b/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
index a3270e9..c949efe 100644
--- a/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
@@ -905,7 +905,7 @@ public class TestRecoveryService extends XDataTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>mapred.mapper.class</name><value>" + MapperReducerForTest.class.getName()
+ "</value></property>" + "<property><name>mapred.reducer.class</name><value>"
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/service/TestShareLibService.java b/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
index 390545d..dc6f6ef 100644
--- a/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestShareLibService.java
@@ -175,7 +175,7 @@ public class TestShareLibService extends XFsTestCase {
try {
services.init();
- String actionXml = "<java>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<java>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "</java>";
Element eActionXml = XmlUtils.parseXml(actionXml);
XConfiguration protoConf = new XConfiguration();
@@ -203,7 +203,7 @@ public class TestShareLibService extends XFsTestCase {
conf.set(ShareLibService.SHIP_LAUNCHER_JAR, "true");
try {
services.init();
- String actionXml = "<pig>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<pig>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "</pig>";
Element eActionXml = XmlUtils.parseXml(actionXml);
XConfiguration protoConf = new XConfiguration();
@@ -249,7 +249,7 @@ public class TestShareLibService extends XFsTestCase {
try {
services.init();
- String actionXml = "<pig>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<pig>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ "<property><name>oozie.action.sharelib.for.pig</name><value>pig_10</value></property>" + "</pig>";
Element eActionXml = XmlUtils.parseXml(actionXml);
@@ -537,7 +537,7 @@ public class TestShareLibService extends XFsTestCase {
createFile(libpath.toString() + Path.SEPARATOR + "pig_10" + Path.SEPARATOR + "pig-10.jar");
createFile(libpath.toString() + Path.SEPARATOR + "oozie" + Path.SEPARATOR + "oozie_luncher.jar");
- String actionXml = "<pig>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<pig>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ "<property><name>oozie.action.sharelib.for.pig</name><value>pig_10</value></property>" + "</pig>";
Element eActionXml = XmlUtils.parseXml(actionXml);
@@ -718,7 +718,7 @@ public class TestShareLibService extends XFsTestCase {
private URI[] setUpPigJob(boolean useSystemSharelib) throws Exception {
services.init();
- String actionXml = "<pig>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<pig>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node></pig>";
Element eActionXml = XmlUtils.parseXml(actionXml);
XConfiguration protoConf = new XConfiguration();
@@ -863,7 +863,7 @@ public class TestShareLibService extends XFsTestCase {
// Test hive-site.xml not in distributed cache
setupSharelibConf("hive-site.xml", "oozie.hive_conf");
- String actionXml = "<hive>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<hive>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<script>test</script>" + "</hive>";
Element eActionXml = XmlUtils.parseXml(actionXml);
@@ -943,7 +943,7 @@ public class TestShareLibService extends XFsTestCase {
prop.put("oozie.hive_conf", "/user/test/" + sharelibPath + "/hive-site.xml#hive-site.xml");
setupSharelibConf("hive-site.xml", "oozie.hive_conf", prop);
- String actionXml = "<pig>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<pig>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<script>test</script>" + "</pig>";
Element eActionXml = XmlUtils.parseXml(actionXml);
XConfiguration protoConf = new XConfiguration();
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/test/TestXTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/test/TestXTestCase.java b/core/src/test/java/org/apache/oozie/test/TestXTestCase.java
index 735f80a..9c0faa3 100644
--- a/core/src/test/java/org/apache/oozie/test/TestXTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/TestXTestCase.java
@@ -193,7 +193,7 @@ public class TestXTestCase extends TestCase {
setSystemProperty(TestConstants.OOZIE_TEST_NAME_NODE, "hdfs://xyz:9000");
setSystemProperty(TestConstants.OOZIE_TEST_JOB_TRACKER, "xyz:9001");
assertEquals("hdfs://xyz:9000", getNameNodeUri());
- assertEquals("xyz:9001", getJobTrackerUri());
+ assertEquals("xyz:9001", getResourceManagerUri());
}
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/test/XDataTestCase.java b/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
index 2105e2f..93d291b 100644
--- a/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XDataTestCase.java
@@ -1094,7 +1094,7 @@ public abstract class XDataTestCase extends XHCatTestCase {
Configuration conf = new XConfiguration();
conf.set(OozieClient.BUNDLE_APP_PATH, bundleAppPath.toString());
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set("jobTracker", getJobTrackerUri());
+ conf.set("jobTracker", getResourceManagerUri());
conf.set("nameNode", getNameNodeUri());
conf.set("appName", "bundle-app-name");
conf.set("coordName1", "coord1");
@@ -1320,7 +1320,7 @@ public abstract class XDataTestCase extends XHCatTestCase {
Configuration jobConf = new XConfiguration();
jobConf.set(OozieClient.COORDINATOR_APP_PATH, appPath.toString());
jobConf.set(OozieClient.USER_NAME, getTestUser());
- jobConf.set("jobTracker", getJobTrackerUri());
+ jobConf.set("jobTracker", getResourceManagerUri());
jobConf.set("nameNode", getNameNodeUri());
jobConf.set("wfAppPath", wfAppPath.toString());
@@ -1434,7 +1434,7 @@ public abstract class XDataTestCase extends XHCatTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>mapred.mapper.class</name><value>" + MapperReducerForTest.class.getName()
+ "</value></property>" + "<property><name>mapred.reducer.class</name><value>"
@@ -1492,7 +1492,7 @@ public abstract class XDataTestCase extends XHCatTestCase {
Configuration conf = new XConfiguration();
conf.set(OozieClient.BUNDLE_APP_PATH, bundleAppPath.toString());
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set("jobTracker", getJobTrackerUri());
+ conf.set("jobTracker", getResourceManagerUri());
conf.set("nameNode", getNameNodeUri());
conf.set("appName", "bundle-app-name");
conf.set("coordName1", "coord1");
@@ -1562,7 +1562,7 @@ public abstract class XDataTestCase extends XHCatTestCase {
Configuration conf = new XConfiguration();
conf.set(OozieClient.BUNDLE_APP_PATH, bundleAppPath.toString());
conf.set(OozieClient.USER_NAME, getTestUser());
- conf.set("jobTracker", getJobTrackerUri());
+ conf.set("jobTracker", getResourceManagerUri());
conf.set("nameNode", getNameNodeUri());
conf.set("coordName1", "coord1");
conf.set("coordName2", "coord2");
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/test/XFsTestCase.java b/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
index 7a419d1..a1bda01 100644
--- a/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
@@ -171,8 +171,8 @@ public abstract class XFsTestCase extends XTestCase {
* @throws HadoopAccessorException thrown if the JobClient could not be obtained.
*/
protected JobClient createJobClient() throws HadoopAccessorException {
- JobConf conf = has.createJobConf(getJobTrackerUri());
- conf.set("mapred.job.tracker", getJobTrackerUri());
+ JobConf conf = has.createJobConf(getResourceManagerUri());
+ conf.set("mapred.job.tracker", getResourceManagerUri());
conf.set("fs.default.name", getNameNodeUri());
return has.createJobClient(getTestUser(), conf);
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/core/src/test/java/org/apache/oozie/test/XTestCase.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/test/XTestCase.java b/core/src/test/java/org/apache/oozie/test/XTestCase.java
index 4442513..9820167 100644
--- a/core/src/test/java/org/apache/oozie/test/XTestCase.java
+++ b/core/src/test/java/org/apache/oozie/test/XTestCase.java
@@ -455,7 +455,7 @@ public abstract class XTestCase extends TestCase {
*
* @return the job tracker URI.
*/
- protected String getJobTrackerUri() {
+ protected String getResourceManagerUri() {
return System.getProperty(TestConstants.OOZIE_TEST_JOB_TRACKER, "localhost:9001");
}
@@ -576,7 +576,6 @@ public abstract class XTestCase extends TestCase {
private void createHdfsPathsAndSetupPermissions() throws IOException {
final FileSystem fileSystem = dfsCluster.getFileSystem();
-
fileSystem.mkdirs(new Path("target/test-data"));
fileSystem.mkdirs(new Path("target/test-data" + "/minicluster/mapred"));
fileSystem.mkdirs(new Path("/user"));
@@ -729,14 +728,14 @@ public abstract class XTestCase extends TestCase {
if (yarnCluster != null) {
return testConfigurations.createJobConfFromYarnCluster(yarnCluster.getConfig());
} else {
- return testConfigurations.createPristineJobConf(getJobTrackerUri(), getNameNodeUri());
+ return testConfigurations.createPristineJobConf(getResourceManagerUri(), getNameNodeUri());
}
}
/**
- * A 'closure' used by {@link XTestCase#executeWhileJobTrackerIsShutdown} method.
+ * A 'closure' used by {@link XTestCase#executeWhileResourceManagerIsShutdown} method.
*/
- public interface ShutdownJobTrackerExecutable {
+ public interface ShutdownResourceManagerExecutable {
/**
* Execute some code
@@ -747,16 +746,23 @@ public abstract class XTestCase extends TestCase {
}
/**
- * Execute some code, expressed via a {@link ShutdownJobTrackerExecutable}, while the JobTracker is shutdown. Once the code has
- * finished, the JobTracker is restarted (even if an exception occurs).
+ * Execute some code, expressed via a {@link ShutdownResourceManagerExecutable}, while the ResourceManager is shutdown. Once the code has
+ * finished, the ResourceManager is restarted (even if an exception occurs).
*
- * @param executable The ShutdownJobTrackerExecutable to execute while the JobTracker is shutdown
+ * @param executable The ShutdownResourceManagerExecutable to execute while the ResourceManager is shutdown
*/
- protected void executeWhileJobTrackerIsShutdown(final ShutdownJobTrackerExecutable executable) {
+ protected void executeWhileResourceManagerIsShutdown(final ShutdownResourceManagerExecutable executable) {
+ for (int i=0; i<yarnCluster.getNumOfResourceManager();i++){
+ yarnCluster.getResourceManager(i).stop();
+ }
try {
executable.execute();
} catch (final Exception e) {
throw new RuntimeException(e);
+ } finally {
+ for (int i=0; i<yarnCluster.getNumOfResourceManager();i++){
+ yarnCluster.getResourceManager(i).start();
+ }
}
}
@@ -786,7 +792,7 @@ public abstract class XTestCase extends TestCase {
final ApplicationId appId = ConverterUtils.toApplicationId(externalId);
final MutableObject<YarnApplicationState> finalState = new MutableObject<YarnApplicationState>();
- final JobConf jobConf = Services.get().get(HadoopAccessorService.class).createJobConf(getJobTrackerUri());
+ final JobConf jobConf = Services.get().get(HadoopAccessorService.class).createJobConf(getResourceManagerUri());
final YarnClient yarnClient = Services.get().get(HadoopAccessorService.class).createYarnClient(getTestUser(), jobConf);
try {
@@ -822,7 +828,7 @@ public abstract class XTestCase extends TestCase {
protected YarnApplicationState getYarnApplicationState(final String externalId) throws HadoopAccessorException, IOException, YarnException {
final ApplicationId appId = ConverterUtils.toApplicationId(externalId);
YarnApplicationState state = null;
- final JobConf jobConf = Services.get().get(HadoopAccessorService.class).createJobConf(getJobTrackerUri());
+ final JobConf jobConf = Services.get().get(HadoopAccessorService.class).createJobConf(getResourceManagerUri());
// This is needed here because we need a mutable final YarnClient
final MutableObject<YarnClient> yarnClientMO = new MutableObject<YarnClient>(null);
try {
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
----------------------------------------------------------------------
diff --git a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
index ed9bba3..7d36bbf 100644
--- a/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
+++ b/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
@@ -22,7 +22,6 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.StringReader;
import java.io.Writer;
import java.text.MessageFormat;
import java.util.Arrays;
@@ -32,22 +31,14 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.RunningJob;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.service.ConfigurationService;
-import org.apache.oozie.service.HadoopAccessorService;
-import org.apache.oozie.service.Services;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.ClassUtils;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
-import org.apache.oozie.util.XmlUtils;
-import org.jdom.Element;
import org.jdom.Namespace;
public class TestHiveActionExecutor extends ActionExecutorTestCase {
@@ -113,7 +104,7 @@ public class TestHiveActionExecutor extends ActionExecutorTestCase {
"</configuration>" +
"<script>" + HIVE_SCRIPT_FILENAME + "</script>" +
"</hive>";
- return MessageFormat.format(script, getJobTrackerUri(), getNameNodeUri());
+ return MessageFormat.format(script, getResourceManagerUri(), getNameNodeUri());
}
private String getActionQueryXml(String query) {
@@ -142,7 +133,7 @@ public class TestHiveActionExecutor extends ActionExecutorTestCase {
"<value>DEBUG</value>" +
"</property>" +
"</configuration>";
- return MessageFormat.format(script, getJobTrackerUri(), getNameNodeUri())
+ return MessageFormat.format(script, getResourceManagerUri(), getNameNodeUri())
+ "<query>" + query + "</query>" +
"</hive>";
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/ddbd90f8/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java
----------------------------------------------------------------------
diff --git a/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java b/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java
index 58e703f..030942a 100644
--- a/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java
+++ b/sharelib/hive2/src/test/java/org/apache/oozie/action/hadoop/TestHive2ActionExecutor.java
@@ -19,7 +19,6 @@
package org.apache.oozie.action.hadoop;
import java.io.OutputStreamWriter;
-import java.io.StringReader;
import java.io.Writer;
import java.text.MessageFormat;
import java.util.ArrayList;
@@ -29,15 +28,9 @@ import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.mapred.JobClient;
-import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.mapred.JobID;
-import org.apache.hadoop.mapred.RunningJob;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.WorkflowAction;
-import org.apache.oozie.service.HadoopAccessorService;
-import org.apache.oozie.service.Services;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
@@ -77,7 +70,7 @@ public class TestHive2ActionExecutor extends ActionExecutorTestCase {
assertEquals(classes, ae.getLauncherClasses());
Element actionXml = XmlUtils.parseXml("<hive2>" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<jdbc-url>jdbc:hive2://foo:1234/bar</jdbc-url>" +
"<password>pass</password>" +
@@ -119,7 +112,7 @@ public class TestHive2ActionExecutor extends ActionExecutorTestCase {
String sampleQuery = "SELECT count(*) from foobar";
Element actionXml = XmlUtils.parseXml("<hive2 xmlns=\"uri:oozie:hive2-action:0.2\">" +
- "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
+ "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<jdbc-url>jdbc:hive2://foo:1234/bar</jdbc-url>" +
"<password>pass</password>" +
@@ -176,7 +169,7 @@ public class TestHive2ActionExecutor extends ActionExecutorTestCase {
"<password>dummy</password>" +
"<script>" + HIVE_SCRIPT_FILENAME + "</script>" +
"</hive2>";
- return MessageFormat.format(script, getJobTrackerUri(), getNameNodeUri(), getHiveServer2JdbcURL(""));
+ return MessageFormat.format(script, getResourceManagerUri(), getNameNodeUri(), getHiveServer2JdbcURL(""));
}
private String getQueryActionXml(String query) {
@@ -186,7 +179,7 @@ public class TestHive2ActionExecutor extends ActionExecutorTestCase {
"<configuration></configuration>" +
"<jdbc-url>{2}</jdbc-url>" +
"<password>dummy</password>";
- String expanded = MessageFormat.format(script, getJobTrackerUri(), getNameNodeUri(), getHiveServer2JdbcURL(""));
+ String expanded = MessageFormat.format(script, getResourceManagerUri(), getNameNodeUri(), getHiveServer2JdbcURL(""));
// MessageFormat strips single quotes, which causes issues with the hive query parser
return expanded +
"<query>" + query + "</query>" + "</hive2>";