Author: rkanter
Date: Mon Feb 4 18:03:14 2013
New Revision: 1442259
URL: http://svn.apache.org/viewvc?rev=1442259&view=rev
Log:
OOZIE-1137 In light of federation use actionLibPath instead of appPath (vaidya
via rkanter)
Modified:
oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.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=1442259&r1=1442258&r2=1442259&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
Mon Feb 4 18:03:14 2013
@@ -388,7 +388,7 @@ public class JavaActionExecutor extends
}
}
- protected void addShareLib(Path appPath, Configuration conf, String
actionShareLibName)
+ protected void addShareLib(Configuration conf, String actionShareLibName)
throws ActionExecutorException {
if (actionShareLibName != null) {
try {
@@ -397,11 +397,11 @@ public class JavaActionExecutor extends
Path actionLibPath = new Path(systemLibPath,
actionShareLibName);
String user = conf.get("user.name");
FileSystem fs =
-
Services.get().get(HadoopAccessorService.class).createFileSystem(user,
appPath.toUri(), conf);
+
Services.get().get(HadoopAccessorService.class).createFileSystem(user,
actionLibPath.toUri(), conf);
if (fs.exists(actionLibPath)) {
FileStatus[] files = fs.listStatus(actionLibPath);
for (FileStatus file : files) {
- addToCache(conf, appPath,
file.getPath().toUri().getPath(), false);
+ addToCache(conf, actionLibPath,
file.getPath().toUri().getPath(), false);
}
}
}
@@ -481,19 +481,19 @@ public class JavaActionExecutor extends
}
}
- addAllShareLibs(appPath, conf, context, actionXml);
+ addAllShareLibs(conf, context, actionXml);
}
// Adds action specific share libs and common share libs
- private void addAllShareLibs(Path appPath, Configuration conf, Context
context, Element actionXml)
+ private void addAllShareLibs(Configuration conf, Context context, Element
actionXml)
throws ActionExecutorException {
// Add action specific share libs
- addActionShareLib(appPath, conf, context, actionXml);
+ addActionShareLib(conf, context, actionXml);
// Add common sharelibs for Oozie
- addShareLib(appPath, conf, JavaActionExecutor.OOZIE_COMMON_LIBDIR);
+ addShareLib(conf, JavaActionExecutor.OOZIE_COMMON_LIBDIR);
}
- private void addActionShareLib(Path appPath, Configuration conf, Context
context, Element actionXml) throws ActionExecutorException {
+ private void addActionShareLib(Configuration conf, Context context,
Element actionXml) throws ActionExecutorException {
XConfiguration wfJobConf = null;
try {
wfJobConf = new XConfiguration(new
StringReader(context.getWorkflow().getConf()));
@@ -505,7 +505,7 @@ public class JavaActionExecutor extends
// Action sharelibs are only added if user has specified to use system
libpath
if (wfJobConf.getBoolean(OozieClient.USE_SYSTEM_LIBPATH, false)) {
// add action specific sharelibs
- addShareLib(appPath, conf, getShareLibName(context, actionXml,
conf));
+ addShareLib(conf, getShareLibName(context, actionXml, conf));
}
}
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1442259&r1=1442258&r2=1442259&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Feb 4 18:03:14 2013
@@ -1,5 +1,6 @@
-- Oozie 3.3.2 (unreleased)
+OOZIE-1137 In light of federation use actionLibPath instead of appPath (vaidya
via rkanter)
OOZIE-1126 see if checkstyle works for oozie development. (jaoki via rkanter)
OOZIE-1124 Split pig unit tests to a separate module (rohini via virag)
OOZIE-1087 Remove requirement of hive-default.xml from Hive action (rkanter)
