Author: tucu
Date: Wed Mar 28 19:53:43 2012
New Revision: 1306559
URL: http://svn.apache.org/viewvc?rev=1306559&view=rev
Log:
OOZIE-788 JavaActionExecutor should not set yarn.resourcemanager.address (tucu)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
incubator/oozie/trunk/release-log.txt
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1306559&r1=1306558&r2=1306559&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
Wed Mar 28 19:53:43 2012
@@ -77,7 +77,6 @@ public class JavaActionExecutor extends
private static final String HADOOP_USER = "user.name";
private static final String HADOOP_JOB_TRACKER = "mapred.job.tracker";
private static final String HADOOP_JOB_TRACKER_2 =
"mapreduce.jobtracker.address";
- private static final String HADOOP_YARN_RM =
"yarn.resourcemanager.address";
private static final String HADOOP_NAME_NODE = "fs.default.name";
public static final String OOZIE_COMMON_LIBDIR = "oozie";
public static final int MAX_EXTERNAL_STATS_SIZE_DEFAULT =
Integer.MAX_VALUE;
@@ -98,7 +97,6 @@ public class JavaActionExecutor extends
DISALLOWED_PROPERTIES.add(HADOOP_JOB_TRACKER);
DISALLOWED_PROPERTIES.add(HADOOP_NAME_NODE);
DISALLOWED_PROPERTIES.add(HADOOP_JOB_TRACKER_2);
- DISALLOWED_PROPERTIES.add(HADOOP_YARN_RM);
}
public JavaActionExecutor() {
@@ -190,7 +188,6 @@ public class JavaActionExecutor extends
conf.set(HADOOP_USER,
context.getProtoActionConf().get(WorkflowAppService.HADOOP_USER));
conf.set(HADOOP_JOB_TRACKER, jobTracker);
conf.set(HADOOP_JOB_TRACKER_2, jobTracker);
- conf.set(HADOOP_YARN_RM, jobTracker);
conf.set(HADOOP_NAME_NODE, nameNode);
conf.set("mapreduce.fileoutputcommitter.marksuccessfuljobs", "true");
return conf;
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1306559&r1=1306558&r2=1306559&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Wed Mar 28 19:53:43 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-788 JavaActionExecutor should not set yarn.resourcemanager.address (tucu)
OOZIE-785 No JsonToBean mapping for coord pausetime(shwetha via Mohammad)
OOZIE-786 tomcat should stop if oozie does not start correctly (tucu)
OOZIE-779 Oozie cannot submit jobs to hadoop 0.23 if running in non-default
host:port (tucu)
