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:20:06 UTC
[35/48] oozie git commit: Revert "OOZIE-2729 change JT to RM in
methods"
http://git-wip-us.apache.org/repos/asf/oozie/blob/7a67022a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
----------------------------------------------------------------------
diff --git a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
index 5e5e94a..6ab9fce 100644
--- a/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
+++ b/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
@@ -92,7 +92,7 @@ public class TestPigActionExecutor extends ActionExecutorTestCase {
assertEquals(classes, ae.getLauncherClasses());
Element actionXml = XmlUtils.parseXml("<pig>" +
- "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
+ "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<script>SCRIPT</script>" +
"<param>a=A</param>" +
@@ -342,7 +342,7 @@ public class TestPigActionExecutor extends ActionExecutorTestCase {
w.close();
String actionXml = "<pig>" +
- "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
+ "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
setPigConfig(writeStats).toXmlString(false) +
"<script>" + script.getName() + "</script>" +
@@ -376,7 +376,7 @@ public class TestPigActionExecutor extends ActionExecutorTestCase {
w.close();
String actionXml = "<pig>" +
- "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
+ "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
setPigConfig(true).toXmlString(false) +
"<script>" + script.getName() + "</script>" +
@@ -421,7 +421,7 @@ public class TestPigActionExecutor extends ActionExecutorTestCase {
getFileSystem().create(rootArchive).close();
String actionXml = "<pig>" +
- " <job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
+ " <job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
" <name-node>" + getNameNodeUri() + "</name-node>" +
" <script>id.pig</script>" +
" <file>" + jar.toString() +
http://git-wip-us.apache.org/repos/asf/oozie/blob/7a67022a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestPyspark.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestPyspark.java b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestPyspark.java
index a0ff58b..9d8d4aa 100644
--- a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestPyspark.java
+++ b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestPyspark.java
@@ -24,9 +24,15 @@ import java.util.ArrayList;
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.IOUtils;
import org.apache.oozie.util.XConfiguration;
@@ -55,7 +61,7 @@ public class TestPyspark extends ActionExecutorTestCase {
"<jar>" + PI_EXAMPLE + "</jar>" +
"<spark-opts>" +sparkOpts +"</spark-opts>" +
"</spark>";
- return MessageFormat.format(script, getResourceManagerUri(), getNameNodeUri());
+ return MessageFormat.format(script, getJobTrackerUri(), getNameNodeUri());
}
public void testPyspark() throws Exception {
http://git-wip-us.apache.org/repos/asf/oozie/blob/7a67022a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java
----------------------------------------------------------------------
diff --git a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java
index 51e412c..d97f1f0 100644
--- a/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java
+++ b/sharelib/spark/src/test/java/org/apache/oozie/action/hadoop/TestSparkActionExecutor.java
@@ -21,10 +21,16 @@ package org.apache.oozie.action.hadoop;
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.yarn.client.api.YarnClient;
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.SparkConfigurationService;
import org.apache.oozie.service.WorkflowAppService;
@@ -43,6 +49,7 @@ import java.io.Writer;
import java.text.MessageFormat;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
@@ -85,7 +92,7 @@ public class TestSparkActionExecutor extends ActionExecutorTestCase {
SparkConfigurationService scs = Services.get().get(SparkConfigurationService.class);
scs.destroy();
ConfigurationService.set("oozie.service.SparkConfigurationService.spark.configurations",
- getResourceManagerUri() + "=" + sparkConfDir.getAbsolutePath());
+ getJobTrackerUri() + "=" + sparkConfDir.getAbsolutePath());
scs.init(Services.get());
_testSetupMethods("local[*]", new HashMap<String, String>(), "client");
@@ -102,7 +109,7 @@ public class TestSparkActionExecutor extends ActionExecutorTestCase {
assertEquals(Arrays.asList(SparkMain.class), ae.getLauncherClasses());
Element actionXml = XmlUtils.parseXml("<spark>" +
- "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
+ "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<master>" + master + "</master>" +
(mode != null ? "<mode>" + mode + "</mode>" : "") +
@@ -155,7 +162,7 @@ public class TestSparkActionExecutor extends ActionExecutorTestCase {
"<arg>" + getAppPath() + "/" + OUTPUT + "</arg>" +
"<spark-opts>--conf " +SPARK_TESTING_MEMORY+"</spark-opts>"+
"</spark>";
- return MessageFormat.format(script, getResourceManagerUri(), getNameNodeUri());
+ return MessageFormat.format(script, getJobTrackerUri(), getNameNodeUri());
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/7a67022a/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
----------------------------------------------------------------------
diff --git a/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java b/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
index 691752d..61d295c 100644
--- a/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
+++ b/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
@@ -22,12 +22,21 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.PathFilter;
+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.IOUtils;
import org.apache.oozie.util.XConfiguration;
+import org.apache.oozie.util.XmlUtils;
+import org.jdom.Element;
+import org.jdom.Namespace;
import java.io.BufferedReader;
import java.io.File;
@@ -35,6 +44,7 @@ import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.io.StringReader;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.Statement;
@@ -42,6 +52,7 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
public class TestSqoopActionExecutor extends ActionExecutorTestCase {
@@ -136,19 +147,19 @@ public class TestSqoopActionExecutor extends ActionExecutorTestCase {
private String getActionXml() {
String command = MessageFormat.format(SQOOP_COMMAND, getActionJdbcUri(), getSqoopOutputDir());
- return MessageFormat.format(SQOOP_ACTION_COMMAND_XML, getResourceManagerUri(), getNameNodeUri(),
+ return MessageFormat.format(SQOOP_ACTION_COMMAND_XML, getJobTrackerUri(), getNameNodeUri(),
"dummy", "dummyValue", command);
}
private String getActionXmlEval() {
String query = "select TT.I, TT.S from TT";
- return MessageFormat.format(SQOOP_ACTION_EVAL_XML, getResourceManagerUri(), getNameNodeUri(),
+ return MessageFormat.format(SQOOP_ACTION_EVAL_XML, getJobTrackerUri(), getNameNodeUri(),
getActionJdbcUri(), query);
}
private String getActionXmlFreeFromQuery() {
String query = "select TT.I, TT.S from TT where $CONDITIONS";
- return MessageFormat.format(SQOOP_ACTION_ARGS_XML, getResourceManagerUri(), getNameNodeUri(),
+ return MessageFormat.format(SQOOP_ACTION_ARGS_XML, getJobTrackerUri(), getNameNodeUri(),
getActionJdbcUri(), query, getSqoopOutputDir());
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/7a67022a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
----------------------------------------------------------------------
diff --git a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
index 78936c4..fc75968 100644
--- a/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
+++ b/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
@@ -86,7 +86,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
}
public Element createUberJarActionXML(String uberJarPath, String additional) throws Exception{
- return XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>"
+ return XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ "<name-node>" + getNameNodeUri() + "</name-node>" + additional + "<configuration>"
+ "<property><name>oozie.mapreduce.uber.jar</name><value>" + uberJarPath + "</value></property>"
+ "</configuration>" + "</map-reduce>");
@@ -125,7 +125,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
Configuration conf = new XConfiguration();
conf.set("nameNode", getNameNodeUri());
- conf.set("jobTracker", getResourceManagerUri());
+ conf.set("jobTracker", getJobTrackerUri());
conf.set(OozieClient.USER_NAME, getTestUser());
conf.set(OozieClient.APP_PATH, new File(getTestCaseDir(), "workflow.xml").toURI().toString());
conf.set(OozieClient.LOG_TOKEN, "t");
@@ -151,7 +151,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
Element eConf = eAction.getChild("name-node", eAction.getNamespace());
assertEquals(getNameNodeUri(), eConf.getText());
eConf = eAction.getChild("job-tracker", eAction.getNamespace());
- assertEquals(getResourceManagerUri(), eConf.getText());
+ assertEquals(getJobTrackerUri(), eConf.getText());
// check other m-r settings
eConf = eAction.getChild("configuration", eAction.getNamespace());
@@ -220,7 +220,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
List<Class<?>> classes = Arrays.<Class<?>>asList(StreamingMain.class);
assertEquals(classes, ae.getLauncherClasses());
- Element actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>"
+ Element actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ "<name-node>" + getNameNodeUri() + "</name-node>" + "<configuration>"
+ "<property><name>mapred.input.dir</name><value>IN</value></property>"
+ "<property><name>mapred.output.dir</name><value>OUT</value></property>" + "</configuration>"
@@ -282,7 +282,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
launcherJobConf = ae.createLauncherConf(getFileSystem(), context, action, actionXml, conf);
assertNull(launcherJobConf.getJar()); // same for launcher conf (not set)
- actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>"
+ actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ "<name-node>" + getNameNodeUri() + "</name-node>" + "</map-reduce>");
conf = ae.createBaseHadoopConf(context, actionXml);
ae.setupActionConf(conf, context, actionXml, getFsTestCaseDir());
@@ -305,7 +305,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
}
serv.getConf().setBoolean("oozie.action.mapreduce.uber.jar.enable", originalUberJarDisabled);
- actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>"
+ actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ "<name-node>" + getNameNodeUri() + "</name-node>" + "<streaming>" + "<mapper>M</mapper>"
+ "<reducer>R</reducer>" + "<record-reader>RR</record-reader>"
+ "<record-reader-mapping>RRM1=1</record-reader-mapping>"
@@ -323,7 +323,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
assertEquals("2", conf.get("oozie.streaming.record-reader-mapping.size"));
assertEquals("2", conf.get("oozie.streaming.env.size"));
- actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>"
+ actionXml = XmlUtils.parseXml("<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>"
+ "<name-node>" + getNameNodeUri() + "</name-node>" + "<pipes>" + "<map>M</map>" + "<reduce>R</reduce>"
+ "<inputformat>IF</inputformat>" + "<partitioner>P</partitioner>" + "<writer>W</writer>"
+ "<program>PP</program>" + "</pipes>" + "<configuration>"
@@ -540,7 +540,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ getMapReduceConfig(inputDir.toString(), outputDir.toString()).toXmlString(false) + "</map-reduce>";
_testSubmit(MAP_REDUCE, actionXml);
@@ -561,7 +561,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
ow.close();
String actionXml = "<map-reduce>" +
- "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
+ "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
"<name-node>" + getNameNodeUri() + "</name-node>" +
"<configuration>" +
"<property><name>mapred.mapper.class</name><value>" + MapperReducerForTest.class.getName() +
@@ -591,7 +591,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
XConfiguration conf = getMapReduceConfig(inputDir.toString(), outputDir.toString());
conf.set(MapperReducerForTest.JOB_XML_OUTPUT_LOCATION, jobXml.toUri().toString());
conf.set("B", "b");
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ conf.toXmlString(false)
+ "<config-class>" + OozieActionConfiguratorForTest.class.getName() + "</config-class>" + "</map-reduce>";
@@ -615,7 +615,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ getMapReduceConfig(inputDir.toString(), outputDir.toString()).toXmlString(false)
+ "<config-class>org.apache.oozie.does.not.exist</config-class>" + "</map-reduce>";
@@ -645,7 +645,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
XConfiguration conf = getMapReduceConfig(inputDir.toString(), outputDir.toString());
conf.setBoolean("oozie.test.throw.exception", true); // causes OozieActionConfiguratorForTest to throw an exception
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ conf.toXmlString(false)
+ "<config-class>" + OozieActionConfiguratorForTest.class.getName() + "</config-class>" + "</map-reduce>";
@@ -710,7 +710,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ getMapReduceCredentialsConfig(inputDir.toString(), outputDir.toString()).toXmlString(false)
+ "</map-reduce>";
@@ -774,7 +774,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>"
+ getMapReduceUberJarConfig(inputDir.toString(), outputDir.toString()).toXmlString(false) + "</map-reduce>";
String jobID = _testSubmit(MAP_REDUCE, actionXml);
@@ -862,7 +862,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + " <streaming>" + " <mapper>cat</mapper>"
+ " <reducer>wc</reducer>" + " </streaming>"
+ streamingConf.toXmlString(false) + "<file>"
@@ -952,7 +952,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
w.write("dummy\n");
w.close();
- String actionXml = "<map-reduce>" + "<job-tracker>" + getResourceManagerUri() + "</job-tracker>" + "<name-node>"
+ String actionXml = "<map-reduce>" + "<job-tracker>" + getJobTrackerUri() + "</job-tracker>" + "<name-node>"
+ getNameNodeUri() + "</name-node>" + " <pipes>" + " <program>" + programPath
+ "#wordcount-simple" + "</program>" + " </pipes>"
+ getPipesConfig(inputDir.toString(), outputDir.toString()).toXmlString(false) + "<file>"
@@ -983,7 +983,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
// configuration.
String actionXml = "<map-reduce>"
+ "<job-tracker>"
- + getResourceManagerUri()
+ + getJobTrackerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1055,7 +1055,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
// configuration.
String actionXml = "<map-reduce>"
+ "<job-tracker>"
- + getResourceManagerUri()
+ + getJobTrackerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1122,7 +1122,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
// configuration.
String actionXml = "<map-reduce>"
+ "<job-tracker>"
- + getResourceManagerUri()
+ + getJobTrackerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1161,7 +1161,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
actionXml = "<map-reduce>"
+ "<job-tracker>"
- + getResourceManagerUri()
+ + getJobTrackerUri()
+ "</job-tracker>"
+ "<name-node>"
+ getNameNodeUri()
@@ -1206,7 +1206,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
mrConfig.set("mapred.job.name", mapredJobName);
StringBuilder sb = new StringBuilder("<map-reduce>")
- .append("<job-tracker>").append(getResourceManagerUri())
+ .append("<job-tracker>").append(getJobTrackerUri())
.append("</job-tracker>").append("<name-node>")
.append(getNameNodeUri()).append("</name-node>")
.append(mrConfig.toXmlString(false)).append("</map-reduce>");
@@ -1303,7 +1303,7 @@ public class TestMapReduceActionExecutor extends ActionExecutorTestCase {
getFileSystem().create(rootArchive).close();
String actionXml = "<map-reduce>" +
- " <job-tracker>" + getResourceManagerUri() + "</job-tracker>" +
+ " <job-tracker>" + getJobTrackerUri() + "</job-tracker>" +
" <name-node>" + getNameNodeUri() + "</name-node>" +
" <main-class>CLASS</main-class>" +
" <file>" + jar.toString() +