Author: kamrul
Date: Thu Mar 8 09:19:33 2012
New Revision: 1298312
URL: http://svn.apache.org/viewvc?rev=1298312&view=rev
Log:
OOZIE-714, 716 and 3.1 Backport of OOZIE-691 - Fix testcases to be compatible
with Hadoop 0.23(Mona via Mohammad)
Modified:
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRCommand.java
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/util/TestClassUtils.java
incubator/oozie/branches/branch-3.1/release-log.txt
Modified:
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
Thu Mar 8 09:19:33 2012
@@ -199,6 +199,7 @@ public class JavaActionExecutor extends
checkForDisallowedProps(launcherConf, "inline launcher
configuration");
XConfiguration.copy(launcherConf, conf);
}
+ conf.set("mapreduce.framework.name", "yarn");
return conf;
}
catch (IOException ex) {
@@ -245,6 +246,7 @@ public class JavaActionExecutor extends
checkForDisallowedProps(inlineConf, "inline configuration");
XConfiguration.copy(inlineConf, actionConf);
}
+ actionConf.set("mapreduce.framework.name", "yarn");
return actionConf;
}
catch (IOException ex) {
Modified:
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRCommand.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRCommand.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRCommand.java
Thu Mar 8 09:19:33 2012
@@ -41,6 +41,8 @@ public class SubmitMRCommand extends Sub
SKIPPED_CONFS.add(WorkflowAppService.HADOOP_UGI);
SKIPPED_CONFS.add(XOozieClient.JT);
SKIPPED_CONFS.add(XOozieClient.NN);
+ SKIPPED_CONFS.add("fs.defaultFS");
+ SKIPPED_CONFS.add("mapreduce.jobtracker.address");
SKIPPED_CONFS.add(WorkflowAppService.HADOOP_JT_KERBEROS_NAME);
SKIPPED_CONFS.add(WorkflowAppService.HADOOP_NN_KERBEROS_NAME);
}
Modified:
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/command/wf/SubmitMRXCommand.java
Thu Mar 8 09:19:33 2012
@@ -42,6 +42,8 @@ public class SubmitMRXCommand extends Su
SKIPPED_CONFS.add(WorkflowAppService.HADOOP_UGI);
SKIPPED_CONFS.add(XOozieClient.JT);
SKIPPED_CONFS.add(XOozieClient.NN);
+ SKIPPED_CONFS.add("fs.defaultFS");
+ SKIPPED_CONFS.add("mapreduce.jobtracker.address");
SKIPPED_CONFS.add(WorkflowAppService.HADOOP_JT_KERBEROS_NAME);
SKIPPED_CONFS.add(WorkflowAppService.HADOOP_NN_KERBEROS_NAME);
}
Modified:
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
Thu Mar 8 09:19:33 2012
@@ -97,6 +97,7 @@ public class HadoopAccessorService imple
validateJobTracker(conf.get("mapred.job.tracker"));
conf = createConfiguration(user, group, conf);
try {
+ conf.set("mapreduce.framework.name", "yarn");
return new JobClient(conf);
}
catch (IOException e) {
Modified:
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/main/java/org/apache/oozie/service/KerberosHadoopAccessorService.java
Thu Mar 8 09:19:33 2012
@@ -31,10 +31,6 @@ import org.apache.oozie.util.XLog;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.ErrorCode;
-import org.apache.oozie.service.HadoopAccessorService;
-import org.apache.oozie.service.HadoopAccessorException;
-import org.apache.oozie.service.Service;
-import org.apache.oozie.service.ServiceException;
import java.io.IOException;
import java.net.URI;
@@ -129,6 +125,7 @@ public class KerberosHadoopAccessorServi
UserGroupInformation ugi = getUGI(user);
JobClient jobClient = ugi.doAs(new
PrivilegedExceptionAction<JobClient>() {
public JobClient run() throws Exception {
+ conf.set("mapreduce.framework.name", "yarn");
return new JobClient(conf);
}
});
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
Thu Mar 8 09:19:33 2012
@@ -31,6 +31,8 @@ import org.apache.oozie.WorkflowActionBe
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.OozieClient;
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;
@@ -108,7 +110,7 @@ public class TestDistCpActionExecutor ex
JobConf jobConf = new JobConf();
jobConf.set("mapred.job.tracker", jobTracker);
injectKerberosInfo(jobConf);
- JobClient jobClient = new JobClient(jobConf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(getTestUser(),
getTestGroup(), jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
Thu Mar 8 09:19:33 2012
@@ -47,6 +47,7 @@ import org.apache.oozie.action.ActionExe
import org.apache.oozie.client.OozieClient;
import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.client.WorkflowJob;
+import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.UUIDService;
import org.apache.oozie.service.WorkflowAppService;
@@ -332,7 +333,7 @@ public class TestJavaActionExecutor exte
JobConf jobConf = new JobConf();
jobConf.set("mapred.job.tracker", jobTracker);
injectKerberosInfo(jobConf);
- JobClient jobClient = new JobClient(jobConf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(getTestUser(),
getTestGroup(), jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
Thu Mar 8 09:19:33 2012
@@ -48,7 +48,7 @@ public class TestLauncher extends XFsTes
private RunningJob _test(String... arg) throws Exception {
Path actionDir = getFsTestCaseDir();
- File jar = IOUtils.createJar(new File(getTestCaseDir()),
"launcher.jar", LauncherMapper.class,
+ File jar = IOUtils.createJar(new File(getTestCaseDir()),
"launcher.jar", LauncherMapper.class, LauncherMainException.class,
LauncherSecurityManager.class,
LauncherException.class, LauncherMainTester.class);
FileSystem fs = getFileSystem();
@@ -65,6 +65,7 @@ public class TestLauncher extends XFsTes
jobConf.set("mapred.job.tracker", getJobTrackerUri());
jobConf.set("fs.default.name", getNameNodeUri());
+ jobConf.set("mapreduce.framework.name", "yarn");
injectKerberosInfo(jobConf);
LauncherMapper lm = new LauncherMapper();
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
Thu Mar 8 09:19:33 2012
@@ -203,8 +203,10 @@ public class TestMapReduceActionError ex
conf.set("fs.default.name", e.getChildTextTrim("name-node"));
conf.set("user.name", context.getProtoActionConf().get("user.name"));
conf.set("group.name", getTestGroup());
+ conf.set("mapreduce.framework.name", "yarn");
injectKerberosInfo(conf);
- JobConf jobConf = new JobConf(conf);
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
String user = jobConf.get("user.name");
String group = jobConf.get("group.name");
JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
@@ -230,8 +232,9 @@ public class TestMapReduceActionError ex
Configuration conf = ae.createBaseHadoopConf(context,
XmlUtils.parseXml(actionXml));
String user = conf.get("user.name");
String group = conf.get("group.name");
- JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
-
new JobConf(conf));
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(60 * 1000, new Predicate() {
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
Thu Mar 8 09:19:33 2012
@@ -212,8 +212,10 @@ public class TestMapReduceActionExecutor
conf.set("fs.default.name", e.getChildTextTrim("name-node"));
conf.set("user.name", context.getProtoActionConf().get("user.name"));
conf.set("group.name", getTestGroup());
+ conf.set("mapreduce.framework.name", "yarn");
injectKerberosInfo(conf);
- JobConf jobConf = new JobConf(conf);
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
String user = jobConf.get("user.name");
String group = jobConf.get("group.name");
JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
@@ -243,8 +245,10 @@ public class TestMapReduceActionExecutor
Configuration conf = ae.createBaseHadoopConf(context,
XmlUtils.parseXml(actionXml));
String user = conf.get("user.name");
String group = conf.get("group.name");
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
- new JobConf(conf));
+ jobConf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(120 * 1000, new Predicate() {
@@ -263,7 +267,7 @@ public class TestMapReduceActionExecutor
assertNotNull(context.getVar("hadoop.counters"));
String counters = context.getVar("hadoop.counters");
- assertTrue(counters.contains("Task$Counter"));
+ assertTrue(counters.contains("Counter"));
}
private void _testSubmitWithCredentials(String name, String actionXml)
throws Exception {
@@ -287,8 +291,10 @@ public class TestMapReduceActionExecutor
Configuration conf = ae.createBaseHadoopConf(context,
XmlUtils.parseXml(actionXml));
String user = conf.get("user.name");
String group = conf.get("group.name");
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
- new JobConf(conf));
+ jobConf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(120 * 1000, new Predicate() {
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceMain.java
Thu Mar 8 09:19:33 2012
@@ -52,11 +52,12 @@ public class TestMapReduceMain extends M
jobConf.set("fs.default.name", getNameNodeUri());
jobConf.set("mapred.input.dir", inputDir.toString());
jobConf.set("mapred.output.dir", outputDir.toString());
+ jobConf.set("mapreduce.framework.name", "yarn");
jobConf.set("user.name", getTestUser());
jobConf.set("hadoop.job.ugi", getTestUser() + "," + getTestGroup());
injectKerberosInfo(jobConf);
-
+
File actionXml = new File(getTestCaseDir(), "action.xml");
OutputStream os = new FileOutputStream(actionXml);
jobConf.writeXml(os);
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
Thu Mar 8 09:19:33 2012
@@ -164,8 +164,10 @@ public class TestPigActionExecutor exten
conf.set("fs.default.name", e.getChildTextTrim("name-node"));
conf.set("user.name", context.getProtoActionConf().get("user.name"));
conf.set("group.name", getTestGroup());
+ conf.set("mapreduce.framework.name","yarn");
injectKerberosInfo(conf);
- JobConf jobConf = new JobConf(conf);
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
String user = jobConf.get("user.name");
String group = jobConf.get("group.name");
JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPigMain.java
Thu Mar 8 09:19:33 2012
@@ -90,6 +90,7 @@ public class TestPigMain extends PigTest
jobConf.setInt("mapred.reduce.max.attempts", 1);
jobConf.set("mapred.job.tracker", getJobTrackerUri());
jobConf.set("fs.default.name", getNameNodeUri());
+ jobConf.set("mapreduce.framework.name","yarn");
injectKerberosInfo(jobConf);
DistributedCache.addFileToClassPath(new
Path(pigJar.toUri().getPath()), getFileSystem().getConf());
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestPipesMain.java
Thu Mar 8 09:19:33 2012
@@ -37,18 +37,9 @@ import java.net.URI;
public class TestPipesMain extends MainTestCase {
public static String getProgramName(XTestCase tc) {
- String hadoopVersion = tc.getHadoopVersion();
- String hadoopSuffix = null;
String osSuffix = null;
- if (hadoopVersion.startsWith("0.20")) {
- hadoopSuffix = "h20";
- }
- else {
- fail();
- }
-
if (System.getProperty("os.name").startsWith("Mac") &&
System.getProperty("os.arch").equals("x86_64")) {
osSuffix = "Mac_OS_X-x86_64-64";
}
@@ -62,7 +53,7 @@ public class TestPipesMain extends MainT
fail();
}
- return "wordcount-simple" + "_" + osSuffix + "_" + hadoopSuffix;
+ return "wordcount-simple" + "_" + osSuffix + "_h20";
}
public Void call() throws Exception {
@@ -95,6 +86,7 @@ public class TestPipesMain extends MainT
jobConf.set("mapred.job.tracker", getJobTrackerUri());
jobConf.set("fs.default.name", getNameNodeUri());
+ jobConf.set("mapreduce.framework.name", "yarn");
jobConf.set("mapred.input.dir", inputDir.toString());
jobConf.set("mapred.output.dir", outputDir.toString());
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/action/hadoop/TestStreamingMain.java
Thu Mar 8 09:19:33 2012
@@ -59,6 +59,7 @@ public class TestStreamingMain extends M
jobConf.setInt("mapred.reduce.max.attempts", 1);
jobConf.set("mapred.job.tracker", getJobTrackerUri());
jobConf.set("fs.default.name", getNameNodeUri());
+ jobConf.set("mapreduce.framework.name", "yarn");
injectKerberosInfo(jobConf);
jobConf.set("user.name", getTestUser());
jobConf.set("hadoop.job.ugi", getTestUser() + "," + getTestGroup());
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
Thu Mar 8 09:19:33 2012
@@ -47,6 +47,7 @@ import org.apache.oozie.service.Services
import org.apache.oozie.service.UUIDService;
import org.apache.oozie.test.XDataTestCase;
import org.apache.oozie.util.Instrumentation;
+import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.WorkflowInstance;
@@ -202,7 +203,10 @@ public class TestActionCheckXCommand ext
Configuration conf = actionExecutor.createBaseHadoopConf(context,
XmlUtils.parseXml(action.getConf()));
String user = conf.get("user.name");
String group = conf.get("group.name");
- JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
new JobConf(conf));
+ conf.set("mapreduce.framework.name", "yarn");
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
String launcherId = action.getExternalId();
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
Thu Mar 8 09:19:33 2012
@@ -158,8 +158,10 @@ public class TestActionStartXCommand ext
Configuration conf = actionExecutor.createBaseHadoopConf(context,
XmlUtils.parseXml(action.getConf()));
String user = conf.get("user.name");
String group = conf.get("group.name");
- JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
- new JobConf(conf));
+ conf.set("mapreduce.framework.name", "yarn");
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
String launcherId = action.getExternalId();
@@ -221,8 +223,10 @@ public class TestActionStartXCommand ext
Configuration conf = actionExecutor.createBaseHadoopConf(context,
XmlUtils.parseXml(action.getConf()));
String user = conf.get("user.name");
String group = conf.get("group.name");
- JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
- new JobConf(conf));
+ conf.set("mapreduce.framework.name", "yarn");
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
String launcherId = action.getExternalId();
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/coord/TestCoordELEvaluator.java
Thu Mar 8 09:19:33 2012
@@ -21,6 +21,7 @@ import java.io.IOException;
import java.util.Date;
import org.apache.hadoop.conf.Configuration;
+import org.apache.oozie.client.OozieClient;
import org.apache.oozie.service.Services;
import org.apache.oozie.test.XTestCase;
import org.apache.oozie.util.DateUtils;
@@ -174,6 +175,7 @@ public class TestCoordELEvaluator extend
dataEvntXML +=
"<uri-template>file:///tmp/coord/${YEAR}/${MONTH}/${DAY}</uri-template></dataset></data-in>";
Element dEvent = XmlUtils.parseXml(dataEvntXML);
ELEvaluator eval = CoordELEvaluator.createLazyEvaluator(actualTime,
nominalTime, dEvent, conf);
+ eval.setVariable(OozieClient.USER_NAME,
conf.get(OozieClient.USER_NAME));
createDir("/tmp/coord/2009/01/02");
String expr = "${coord:latest(0)} ${coord:latest(-1)}";
// Dependent on the directory structure
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
Thu Mar 8 09:19:33 2012
@@ -215,8 +215,10 @@ public class TestRecoveryService extends
Configuration conf = actionExecutor.createBaseHadoopConf(context,
XmlUtils.parseXml(action.getConf()));
String user = conf.get("user.name");
String group = conf.get("group.name");
- JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
- new JobConf(conf));
+ conf.set("mapreduce.framework.name", "yarn");
+ JobConf jobConf = new JobConf();
+ XConfiguration.copy(conf, jobConf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
String launcherId = action.getExternalId();
Modified:
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/util/TestClassUtils.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/util/TestClassUtils.java?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
---
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/util/TestClassUtils.java
(original)
+++
incubator/oozie/branches/branch-3.1/core/src/test/java/org/apache/oozie/util/TestClassUtils.java
Thu Mar 8 09:19:33 2012
@@ -18,11 +18,11 @@
package org.apache.oozie.util;
import org.apache.oozie.test.XTestCase;
-import org.apache.hadoop.io.Writable;
+import org.json.simple.JSONArray;
public class TestClassUtils extends XTestCase {
public void testContainingJar() {
-
assertTrue(ClassUtils.findContainingJar(Writable.class).contains("hadoop-core"));
+
assertTrue(ClassUtils.findContainingJar(JSONArray.class).contains("json-simple"));
}
}
Modified: incubator/oozie/branches/branch-3.1/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/branches/branch-3.1/release-log.txt?rev=1298312&r1=1298311&r2=1298312&view=diff
==============================================================================
--- incubator/oozie/branches/branch-3.1/release-log.txt (original)
+++ incubator/oozie/branches/branch-3.1/release-log.txt Thu Mar 8 09:19:33 2012
@@ -1,5 +1,6 @@
-- Oozie 3.1.4 release
+OOZIE-714, 716 and 3.1 Backport of OOZIE-691 - Fix testcases to be compatible
with Hadoop 0.23(Mona via Mohammad)
OOZIE-688: POM file changes for oozie version 3.1.4 having Hadoop 23
support(Mona via Mohammad)
OOZIE-733 Script to inject the JARs required by Oozie to run with Hadoop 23
(Mona via Mohammad)
