Author: rkanter
Date: Fri Feb 22 01:19:51 2013
New Revision: 1448876
URL: http://svn.apache.org/r1448876
Log:
OOZIE-1015 HadoopAccessorService jobtracker validation should not have
hardcoded conf key (mona)
Modified:
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
oozie/branches/branch-3.3/release-log.txt
Modified:
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1448876&r1=1448875&r2=1448876&view=diff
==============================================================================
---
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
(original)
+++
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
Fri Feb 22 01:19:51 2013
@@ -78,10 +78,10 @@ import org.apache.hadoop.security.token.
public class JavaActionExecutor extends ActionExecutor {
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 HADOOP_JOB_TRACKER = "mapred.job.tracker";
+ public static final String HADOOP_JOB_TRACKER_2 =
"mapreduce.jobtracker.address";
+ public static final String HADOOP_YARN_RM = "yarn.resourcemanager.address";
+ public static final String HADOOP_NAME_NODE = "fs.default.name";
private static final String HADOOP_JOB_NAME = "mapred.job.name";
public static final String OOZIE_COMMON_LIBDIR = "oozie";
public static final int MAX_EXTERNAL_STATS_SIZE_DEFAULT =
Integer.MAX_VALUE;
@@ -721,7 +721,7 @@ public class JavaActionExecutor extends
if (alreadyRunning && !isUserRetry) {
runningJob = jobClient.getJob(JobID.forName(launcherId));
if (runningJob == null) {
- String jobTracker =
launcherJobConf.get("mapred.job.tracker");
+ String jobTracker =
launcherJobConf.get(HADOOP_JOB_TRACKER);
throw new
ActionExecutorException(ActionExecutorException.ErrorType.ERROR, "JA017",
"unknown job [{0}@{1}], cannot recover",
launcherId, jobTracker);
}
Modified:
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1448876&r1=1448875&r2=1448876&view=diff
==============================================================================
---
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
(original)
+++
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
Fri Feb 22 01:19:51 2013
@@ -30,6 +30,7 @@ import org.apache.hadoop.security.UserGr
import org.apache.hadoop.filecache.DistributedCache;
import org.apache.hadoop.security.token.Token;
import org.apache.oozie.ErrorCode;
+import org.apache.oozie.action.hadoop.JavaActionExecutor;
import org.apache.oozie.util.ParamChecker;
import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XLog;
@@ -364,7 +365,7 @@ public class HadoopAccessorService imple
if (!conf.getBoolean(OOZIE_HADOOP_ACCESSOR_SERVICE_CREATED, false)) {
throw new HadoopAccessorException(ErrorCode.E0903);
}
- String jobTracker = conf.get("mapred.job.tracker");
+ String jobTracker = conf.get(JavaActionExecutor.HADOOP_JOB_TRACKER);
validateJobTracker(jobTracker);
try {
UserGroupInformation ugi = getUGI(user);
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1448876&r1=1448875&r2=1448876&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Fri Feb 22 01:19:51 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-1015 HadoopAccessorService jobtracker validation should not have
hardcoded conf key (mona)
OOZIE-669 Deprecate oozie-start.sh, oozie-stop.sh & oozie-run.sh scripts
(rkanter via tucu)
OOZIE-1219 The timezone cookie should never expire (rkanter)
OOZIE-1220 Make the login example cookie expire (rkanter)
