You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by rk...@apache.org on 2013/04/25 09:15:25 UTC
svn commit: r1475649 - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/action/hadoop/
core/src/main/java/org/apache/oozie/service/
core/src/test/java/org/apache/oozie/service/
Author: rkanter
Date: Thu Apr 25 07:15:25 2013
New Revision: 1475649
URL: http://svn.apache.org/r1475649
Log:
OOZIE-1337 HadoopAccessorService has two static methods so you can't override them with another implementation (rkanter)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
oozie/trunk/release-log.txt
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java?rev=1475649&r1=1475648&r2=1475649&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java Thu Apr 25 07:15:25 2013
@@ -735,7 +735,8 @@ public class JavaActionExecutor extends
XLog.getLog(getClass()).debug("Submitting the job through Job Client for action " + action.getId());
// setting up propagation of the delegation token.
- Token<DelegationTokenIdentifier> mrdt = jobClient.getDelegationToken(HadoopAccessorService
+ HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
+ Token<DelegationTokenIdentifier> mrdt = jobClient.getDelegationToken(has
.getMRDelegationTokenRenewer(launcherJobConf));
launcherJobConf.getCredentials().addToken(HadoopAccessorService.MR_TOKEN_ALIAS, mrdt);
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1475649&r1=1475648&r2=1475649&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java Thu Apr 25 07:15:25 2013
@@ -51,8 +51,7 @@ import java.util.concurrent.ConcurrentHa
/**
* The HadoopAccessorService returns HadoopAccessor instances configured to work on behalf of a user-group. <p/> The
* default accessor used is the base accessor which just injects the UGI into the configuration instance used to
- * create/obtain JobClient and ileSystem instances. <p/> The HadoopAccess class to use can be configured in the
- * <code>oozie-site.xml</code> using the <code>oozie.service.HadoopAccessorService.accessor.class</code> property.
+ * create/obtain JobClient and FileSystem instances.
*/
public class HadoopAccessorService implements Service {
@@ -68,14 +67,14 @@ public class HadoopAccessorService imple
public static final String KERBEROS_PRINCIPAL = CONF_PREFIX + "kerberos.principal";
public static final Text MR_TOKEN_ALIAS = new Text("oozie mr token");
- private static final String OOZIE_HADOOP_ACCESSOR_SERVICE_CREATED = "oozie.HadoopAccessorService.created";
+ protected static final String OOZIE_HADOOP_ACCESSOR_SERVICE_CREATED = "oozie.HadoopAccessorService.created";
/** The Kerberos principal for the job tracker.*/
- private static final String JT_PRINCIPAL = "mapreduce.jobtracker.kerberos.principal";
+ protected static final String JT_PRINCIPAL = "mapreduce.jobtracker.kerberos.principal";
/** The Kerberos principal for the resource manager.*/
- private static final String RM_PRINCIPAL = "yarn.resourcemanager.principal";
- 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";
+ protected static final String RM_PRINCIPAL = "yarn.resourcemanager.principal";
+ protected static final String HADOOP_JOB_TRACKER = "mapred.job.tracker";
+ protected static final String HADOOP_JOB_TRACKER_2 = "mapreduce.jobtracker.address";
+ protected static final String HADOOP_YARN_RM = "yarn.resourcemanager.address";
private static final Map<String, Text> mrTokenRenewers = new HashMap<String, Text>();
private Set<String> jobTrackerWhitelist = new HashSet<String>();
@@ -459,7 +458,7 @@ public class HadoopAccessorService imple
}
}
- public static Text getMRDelegationTokenRenewer(JobConf jobConf) throws IOException {
+ public Text getMRDelegationTokenRenewer(JobConf jobConf) throws IOException {
if (UserGroupInformation.isSecurityEnabled()) { // secure cluster
return getMRTokenRenewerInternal(jobConf);
}
@@ -469,7 +468,7 @@ public class HadoopAccessorService imple
}
// Package private for unit test purposes
- static Text getMRTokenRenewerInternal(JobConf jobConf) throws IOException {
+ Text getMRTokenRenewerInternal(JobConf jobConf) throws IOException {
// Getting renewer correctly for JT principal also though JT in hadoop 1.x does not have
// support for renewing/cancelling tokens
String servicePrincipal = jobConf.get(RM_PRINCIPAL, jobConf.get(JT_PRINCIPAL));
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java?rev=1475649&r1=1475648&r2=1475649&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java Thu Apr 25 07:15:25 2013
@@ -117,22 +117,20 @@ public class TestHadoopAccessorService e
}
public void testGetMRDelegationTokenRenewer() throws Exception {
+ HadoopAccessorService has = Services.get().get(HadoopAccessorService.class);
JobConf jobConf = new JobConf(false);
- assertEquals(new Text("oozie mr token"), HadoopAccessorService.getMRTokenRenewerInternal(jobConf));
+ assertEquals(new Text("oozie mr token"), has.getMRTokenRenewerInternal(jobConf));
jobConf.set("mapred.job.tracker", "localhost:50300");
jobConf.set("mapreduce.jobtracker.kerberos.principal", "mapred/_HOST@KDC.DOMAIN.COM");
- assertEquals(new Text("mapred/localhost@KDC.DOMAIN.COM"),
- HadoopAccessorService.getMRTokenRenewerInternal(jobConf));
+ assertEquals(new Text("mapred/localhost@KDC.DOMAIN.COM"), has.getMRTokenRenewerInternal(jobConf));
jobConf = new JobConf(false);
jobConf.set("mapreduce.jobtracker.address", "127.0.0.1:50300");
jobConf.set("mapreduce.jobtracker.kerberos.principal", "mapred/_HOST@KDC.DOMAIN.COM");
- assertEquals(new Text("mapred/localhost@KDC.DOMAIN.COM"),
- HadoopAccessorService.getMRTokenRenewerInternal(jobConf));
+ assertEquals(new Text("mapred/localhost@KDC.DOMAIN.COM"), has.getMRTokenRenewerInternal(jobConf));
jobConf = new JobConf(false);
jobConf.set("yarn.resourcemanager.address", "localhost:8032");
jobConf.set("yarn.resourcemanager.principal", "rm/server.com@KDC.DOMAIN.COM");
- assertEquals(new Text("rm/server.com@KDC.DOMAIN.COM"),
- HadoopAccessorService.getMRTokenRenewerInternal(jobConf));
+ assertEquals(new Text("rm/server.com@KDC.DOMAIN.COM"), has.getMRTokenRenewerInternal(jobConf));
}
public void testCheckSupportedFilesystem() throws Exception {
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1475649&r1=1475648&r2=1475649&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Thu Apr 25 07:15:25 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1337 HadoopAccessorService has two static methods so you can't override them with another implementation (rkanter)
OOZIE-1333 Some testcases related to EventHandlerService are failing in a transient way (virag)
OOZIE-1316 fix coverage org.apache.oozie.action.hadoop (aleksgor via rkanter)
OOZIE-1224 web console user interface improvements (matthew ropp via mona)