Author: tucu
Date: Mon Mar 12 22:36:48 2012
New Revision: 1299914
URL: http://svn.apache.org/viewvc?rev=1299914&view=rev
Log:
OOZIE-754 remove use of group from HadoopAccessor (tucu)
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsELFunctions.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/JavaActionExecutor.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/JobUtils.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
incubator/oozie/trunk/release-log.txt
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -135,11 +135,10 @@ public class FsActionExecutor extends Ac
*/
private FileSystem getFileSystemFor(Path path, Context context) throws
HadoopAccessorException {
String user = context.getWorkflow().getUser();
- String group = context.getWorkflow().getGroup();
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
JobConf conf = has.createJobConf(path.toUri().getAuthority());
XConfiguration.copy(context.getProtoActionConf(), conf);
- return has.createFileSystem(user, group, path.toUri(), conf);
+ return has.createFileSystem(user, path.toUri(), conf);
}
/**
@@ -149,10 +148,10 @@ public class FsActionExecutor extends Ac
* @return FileSystem
* @throws HadoopAccessorException
*/
- private FileSystem getFileSystemFor(Path path, String user, String group)
throws HadoopAccessorException {
+ private FileSystem getFileSystemFor(Path path, String user) throws
HadoopAccessorException {
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
JobConf jobConf = has.createJobConf(path.toUri().getAuthority());
- return has.createFileSystem(user, group, path.toUri(), jobConf);
+ return has.createFileSystem(user, path.toUri(), jobConf);
}
void mkdir(Context context, Path path) throws ActionExecutorException {
@@ -207,7 +206,7 @@ public class FsActionExecutor extends Ac
public void delete(String user, String group, Path path) throws
ActionExecutorException {
try {
validatePath(path, true);
- FileSystem fs = getFileSystemFor(path, user, group);
+ FileSystem fs = getFileSystemFor(path, user);
if (fs.exists(path)) {
if (!fs.delete(path, true)) {
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsELFunctions.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsELFunctions.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsELFunctions.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/FsELFunctions.java
Mon Mar 12 22:36:48 2012
@@ -42,7 +42,7 @@ public class FsELFunctions {
String group = workflow.getGroup();
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
JobConf conf = has.createJobConf(uri.getAuthority());
- return has.createFileSystem(user, group, uri, conf);
+ return has.createFileSystem(user, uri, conf);
}
/**
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=1299914&r1=1299913&r2=1299914&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
Mon Mar 12 22:36:48 2012
@@ -300,7 +300,7 @@ public class JavaActionExecutor extends
String user = conf.get("user.name");
String group = conf.get("group.name");
-
Services.get().get(HadoopAccessorService.class).addFileToClassPath(user, group,
path, conf);
+
Services.get().get(HadoopAccessorService.class).addFileToClassPath(user, path,
conf);
}
else {
DistributedCache.addCacheFile(uri, conf);
@@ -379,7 +379,7 @@ public class JavaActionExecutor extends
String user = conf.get("user.name");
String group = conf.get("group.name");
FileSystem fs =
-
Services.get().get(HadoopAccessorService.class).createFileSystem(user, group,
conf);
+
Services.get().get(HadoopAccessorService.class).createFileSystem(user, conf);
if (fs.exists(actionLibPath)) {
FileStatus[] files = fs.listStatus(actionLibPath);
for (FileStatus file : files) {
@@ -869,7 +869,7 @@ public class JavaActionExecutor extends
protected JobClient createJobClient(Context context, JobConf jobConf)
throws HadoopAccessorException {
String user = context.getWorkflow().getUser();
String group = context.getWorkflow().getGroup();
- return
Services.get().get(HadoopAccessorService.class).createJobClient(user, group,
jobConf);
+ return
Services.get().get(HadoopAccessorService.class).createJobClient(user, jobConf);
}
@Override
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapper.java
Mon Mar 12 22:36:48 2012
@@ -132,7 +132,7 @@ public class LauncherMapper<K1, V1, K2,
//FileSystem fs = FileSystem.get(launcherConf);
FileSystem fs = Services.get().get(HadoopAccessorService.class)
.createFileSystem(launcherConf.get("user.name"),
- launcherConf.get("group.name"),
launcherConf);
+ launcherConf);
if (fs.exists(recoveryFile)) {
InputStream is = fs.open(recoveryFile);
@@ -197,7 +197,7 @@ public class LauncherMapper<K1, V1, K2,
actionConf.set(OOZIE_ACTION_ID, actionId);
FileSystem fs =
Services.get().get(HadoopAccessorService.class).createFileSystem(launcherConf.get("user.name"),
- launcherConf.get("group.name"), launcherConf);
+
launcherConf);
fs.mkdirs(actionDir);
OutputStream os = fs.create(new Path(actionDir, ACTION_CONF_XML));
@@ -310,7 +310,7 @@ public class LauncherMapper<K1, V1, K2,
Path p = getIdSwapPath(actionDir);
// log.debug("Checking for newId file in: [{0}]", p);
- FileSystem fs =
Services.get().get(HadoopAccessorService.class).createFileSystem(user, group,
p.toUri(),
+ FileSystem fs =
Services.get().get(HadoopAccessorService.class).createFileSystem(user,
p.toUri(),
new Configuration());
if (fs.exists(p)) {
log.debug("Hadoop Counters is null, but found newID file.");
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/bundle/BundleSubmitXCommand.java
Mon Mar 12 22:36:48 2012
@@ -272,7 +272,7 @@ public class BundleSubmitXCommand extend
String user =
ParamChecker.notEmpty(conf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf =
has.createJobConf(bundleAppPath.toUri().getAuthority());
- FileSystem fs = has.createFileSystem(user, null,
bundleAppPath.toUri(), fsConf);
+ FileSystem fs = has.createFileSystem(user, bundleAppPath.toUri(),
fsConf);
// app path could be a directory
if (!fs.isFile(bundleAppPath)) {
@@ -332,7 +332,7 @@ public class BundleSubmitXCommand extend
LOG.debug("user =" + user);
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, null, uri, fsConf);
+ FileSystem fs = has.createFileSystem(user, uri, fsConf);
Path appDefPath = null;
// app path could be a directory
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordActionInputCheckXCommand.java
Mon Mar 12 22:36:48 2012
@@ -412,7 +412,7 @@ public class CoordActionInputCheckXComma
try {
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf =
has.createJobConf(path.toUri().getAuthority());
- return has.createFileSystem(user, null, path.toUri(),
fsConf).exists(path);
+ return has.createFileSystem(user, path.toUri(),
fsConf).exists(path);
}
catch (HadoopAccessorException e) {
throw new IOException(e);
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/coord/CoordSubmitXCommand.java
Mon Mar 12 22:36:48 2012
@@ -408,7 +408,7 @@ public class CoordSubmitXCommand extends
String user =
ParamChecker.notEmpty(conf.get(OozieClient.USER_NAME), OozieClient.USER_NAME);
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf =
has.createJobConf(coordAppPath.toUri().getAuthority());
- FileSystem fs = has.createFileSystem(user, null,
coordAppPath.toUri(), fsConf);
+ FileSystem fs = has.createFileSystem(user, coordAppPath.toUri(),
fsConf);
// app path could be a directory
if (!fs.isFile(coordAppPath)) {
@@ -940,7 +940,7 @@ public class CoordSubmitXCommand extends
LOG.debug("user =" + user);
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, null, uri, fsConf);
+ FileSystem fs = has.createFileSystem(user, uri, fsConf);
Path appDefPath = null;
// app path could be a directory
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ActionXCommand.java
Mon Mar 12 22:36:48 2012
@@ -464,7 +464,7 @@ public abstract class ActionXCommand<T>
URI uri = new URI(getWorkflow().getAppPath());
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- return has.createFileSystem(workflow.getUser(),
workflow.getGroup(), uri, fsConf);
+ return has.createFileSystem(workflow.getUser(), uri, fsConf);
}
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/ReRunXCommand.java
Mon Mar 12 22:36:48 2012
@@ -121,7 +121,7 @@ public class ReRunXCommand extends Workf
URI uri = new URI(conf.get(OozieClient.APP_PATH));
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(wfBean.getUser(),
wfBean.getGroup(), uri, fsConf);
+ FileSystem fs = has.createFileSystem(wfBean.getUser(), uri,
fsConf);
Path configDefault = null;
// app path could be a directory
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/SubmitXCommand.java
Mon Mar 12 22:36:48 2012
@@ -105,7 +105,7 @@ public class SubmitXCommand extends Work
URI uri = new URI(conf.get(OozieClient.APP_PATH));
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, group, uri, fsConf);
+ FileSystem fs = has.createFileSystem(user, uri, fsConf);
Path configDefault = null;
// app path could be a directory
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/command/wf/WfEndXCommand.java
Mon Mar 12 22:36:48 2012
@@ -18,7 +18,6 @@
package org.apache.oozie.command.wf;
import java.io.IOException;
-import java.io.StringReader;
import java.net.URI;
import java.net.URISyntaxException;
@@ -32,7 +31,6 @@ import org.apache.oozie.command.Precondi
import org.apache.oozie.service.HadoopAccessorException;
import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.Services;
-import org.apache.oozie.util.XConfiguration;
/**
* This Command is expected to be called when a Workflow moves to any terminal
@@ -82,7 +80,7 @@ public class WfEndXCommand extends Workf
URI uri = new URI(workflow.getAppPath());
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- return has.createFileSystem(workflow.getUser(), workflow.getGroup(),
uri, fsConf);
+ return has.createFileSystem(workflow.getUser(), uri, fsConf);
}
@Override
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/coord/CoordELFunctions.java
Mon Mar 12 22:36:48 2012
@@ -820,7 +820,7 @@ public class CoordELFunctions {
Path path = new Path(sPath);
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(path.toUri().getAuthority());
- return has.createFileSystem(user, group, path.toUri(),
fsConf).exists(path);
+ return has.createFileSystem(user, path.toUri(), fsConf).exists(path);
}
/**
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/AuthorizationService.java
Mon Mar 12 22:36:48 2012
@@ -270,7 +270,7 @@ public class AuthorizationService implem
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
URI uri = new Path(appPath).toUri();
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, group, uri, fsConf);
+ FileSystem fs = has.createFileSystem(user, uri, fsConf);
Path path = new Path(appPath);
try {
@@ -322,7 +322,7 @@ public class AuthorizationService implem
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
URI uri = new Path(appPath).toUri();
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, group, uri, fsConf);
+ FileSystem fs = has.createFileSystem(user, uri, fsConf);
Path path = new Path(appPath);
try {
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/HadoopAccessorService.java
Mon Mar 12 22:36:48 2012
@@ -234,13 +234,14 @@ public class HadoopAccessorService imple
/**
* Return a JobClient created with the provided user/group.
- *
+ *
+ *
* @param conf JobConf with all necessary information to create the
* JobClient.
* @return JobClient created with the provided user/group.
* @throws HadoopAccessorException if the client could not be created.
*/
- public JobClient createJobClient(String user, String group, final JobConf
conf) throws HadoopAccessorException {
+ public JobClient createJobClient(String user, final JobConf conf) throws
HadoopAccessorException {
ParamChecker.notEmpty(user, "user");
if (!conf.getBoolean(OOZIE_HADOOP_ACCESSOR_SERVICE_CREATED, false)) {
throw new HadoopAccessorException(ErrorCode.E0903);
@@ -269,14 +270,15 @@ public class HadoopAccessorService imple
/**
* Return a FileSystem created with the provided user/group.
*
+ *
* @param conf Configuration with all necessary information to create the
FileSystem.
* @return FileSystem created with the provided user/group.
* @throws HadoopAccessorException if the filesystem could not be created.
*/
- public FileSystem createFileSystem(String user, String group, final
Configuration conf)
+ public FileSystem createFileSystem(String user, final Configuration conf)
throws HadoopAccessorException {
try {
- return createFileSystem(user, group,new
URI(conf.get("fs.default.name")), conf);
+ return createFileSystem(user, new
URI(conf.get("fs.default.name")), conf);
}
catch (URISyntaxException ex) {
throw new HadoopAccessorException(ErrorCode.E0902, ex);
@@ -286,12 +288,13 @@ public class HadoopAccessorService imple
/**
* Return a FileSystem created with the provided user/group for the
specified URI.
*
+ *
* @param uri file system URI.
* @param conf Configuration with all necessary information to create the
FileSystem.
* @return FileSystem created with the provided user/group.
* @throws HadoopAccessorException if the filesystem could not be created.
*/
- public FileSystem createFileSystem(String user, String group, final URI
uri, final Configuration conf)
+ public FileSystem createFileSystem(String user, final URI uri, final
Configuration conf)
throws HadoopAccessorException {
ParamChecker.notEmpty(user, "user");
if (!conf.getBoolean(OOZIE_HADOOP_ACCESSOR_SERVICE_CREATED, false)) {
@@ -354,7 +357,7 @@ public class HadoopAccessorService imple
}
}
- public void addFileToClassPath(String user, String group, final Path file,
final Configuration conf)
+ public void addFileToClassPath(String user, final Path file, final
Configuration conf)
throws IOException {
ParamChecker.notEmpty(user, "user");
try {
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/LiteWorkflowAppService.java
Mon Mar 12 22:36:48 2012
@@ -22,7 +22,6 @@ import org.apache.oozie.client.OozieClie
import org.apache.oozie.workflow.WorkflowApp;
import org.apache.oozie.workflow.WorkflowException;
import org.apache.oozie.workflow.WorkflowLib;
-import org.apache.oozie.service.Services;
import org.apache.oozie.util.ParamChecker;
/**
@@ -39,7 +38,7 @@ public class LiteWorkflowAppService exte
public WorkflowApp parseDef(Configuration jobConf, String authToken)
throws WorkflowException {
String appPath =
ParamChecker.notEmpty(jobConf.get(OozieClient.APP_PATH), OozieClient.APP_PATH);
String user =
ParamChecker.notEmpty(jobConf.get(OozieClient.USER_NAME),
OozieClient.USER_NAME);
- String workflowXml = readDefinition(appPath, user, null, authToken,
jobConf);
+ String workflowXml = readDefinition(appPath, user, authToken, jobConf);
return parseDef(workflowXml);
}
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/service/WorkflowAppService.java
Mon Mar 12 22:36:48 2012
@@ -92,20 +92,20 @@ public abstract class WorkflowAppService
/**
* Read workflow definition.
*
+ *
* @param appPath application path.
* @param user user name.
- * @param group group name.
* @param autToken authentication token.
* @return workflow definition.
* @throws WorkflowException thrown if the definition could not be read.
*/
- protected String readDefinition(String appPath, String user, String group,
String autToken, Configuration conf)
+ protected String readDefinition(String appPath, String user, String
autToken, Configuration conf)
throws WorkflowException {
try {
URI uri = new URI(appPath);
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
JobConf jobConf = has.createJobConf(uri.getAuthority());
- FileSystem fs = has.createFileSystem(user, group, uri, jobConf);
+ FileSystem fs = has.createFileSystem(user, uri, jobConf);
// app path could be a directory
Path path = new Path(uri.getPath());
@@ -162,7 +162,7 @@ public abstract class WorkflowAppService
conf.set(HADOOP_NN_KERBEROS_NAME,
jobConf.get(HADOOP_NN_KERBEROS_NAME));
- FileSystem fs = has.createFileSystem(user, group, uri, conf);
+ FileSystem fs = has.createFileSystem(user, uri, conf);
Path appPath = new Path(uri.getPath());
XLog.getLog(getClass()).debug("jobConf.libPath = " +
jobConf.get(OozieClient.LIBPATH));
Modified:
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/JobUtils.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/JobUtils.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/JobUtils.java
(original)
+++
incubator/oozie/trunk/core/src/main/java/org/apache/oozie/util/JobUtils.java
Mon Mar 12 22:36:48 2012
@@ -66,7 +66,7 @@ public class JobUtils {
URI uri = new Path(appPathStr).toUri();
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
Configuration fsConf = has.createJobConf(uri.getAuthority());
- fs = has.createFileSystem(user, group, uri, fsConf);
+ fs = has.createFileSystem(user, uri, fsConf);
}
catch (HadoopAccessorException ex) {
throw new IOException(ex.getMessage());
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestDistCpActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -29,7 +29,6 @@ import org.apache.hadoop.mapred.JobID;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.oozie.WorkflowActionBean;
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;
@@ -110,7 +109,7 @@ public class TestDistCpActionExecutor ex
jobConf.set("mapred.job.tracker", jobTracker);
injectKerberosInfo(jobConf);
JobClient jobClient =
-
Services.get().get(HadoopAccessorService.class).createJobClient(getTestUser(),
getTestGroup(), jobConf);
+
Services.get().get(HadoopAccessorService.class).createJobClient(getTestUser(),
jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -36,7 +36,6 @@ import org.apache.hadoop.mapred.JobID;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.oozie.WorkflowActionBean;
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;
@@ -212,7 +211,7 @@ public class TestHiveActionExecutor exte
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);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestJavaActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -334,7 +334,7 @@ public class TestJavaActionExecutor exte
jobConf.set("mapred.job.tracker", jobTracker);
injectKerberosInfo(jobConf);
JobClient jobClient =
-
Services.get().get(HadoopAccessorService.class).createJobClient(getTestUser(),
getTestGroup(), jobConf);
+
Services.get().get(HadoopAccessorService.class).createJobClient(getTestUser(),
jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionError.java
Mon Mar 12 22:36:48 2012
@@ -27,7 +27,6 @@ import org.apache.hadoop.mapred.JobID;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.WorkflowAction;
-import org.apache.oozie.client.OozieClient;
import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.WorkflowAppService;
@@ -210,7 +209,7 @@ public class TestMapReduceActionError ex
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);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
@@ -233,7 +232,7 @@ public class TestMapReduceActionError ex
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(60 * 1000, new Predicate() {
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -28,7 +28,6 @@ import org.apache.hadoop.streaming.Strea
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.WorkflowAction;
-import org.apache.oozie.client.OozieClient;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.HadoopAccessorService;
@@ -219,7 +218,7 @@ public class TestMapReduceActionExecutor
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);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
@@ -246,7 +245,7 @@ public class TestMapReduceActionExecutor
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(120 * 1000, new Predicate() {
@@ -293,7 +292,7 @@ public class TestMapReduceActionExecutor
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(120 * 1000, new Predicate() {
@@ -487,7 +486,7 @@ public class TestMapReduceActionExecutor
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(120 * 1000, new Predicate() {
@@ -562,7 +561,7 @@ public class TestMapReduceActionExecutor
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
final RunningJob mrJob =
jobClient.getJob(JobID.forName(context.getAction().getExternalId()));
waitFor(120 * 1000, new Predicate() {
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -27,7 +27,6 @@ import org.apache.hadoop.mapred.JobID;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.WorkflowAction;
-import org.apache.oozie.client.OozieClient;
import org.apache.oozie.service.WorkflowAppService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.HadoopAccessorService;
@@ -176,7 +175,7 @@ public class TestPigActionExecutor exten
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);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -32,7 +32,6 @@ import org.apache.hadoop.mapred.JobID;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.oozie.WorkflowActionBean;
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;
@@ -291,7 +290,7 @@ public class TestShellActionExecutor ext
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);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
Mon Mar 12 22:36:48 2012
@@ -27,7 +27,6 @@ import org.apache.hadoop.mapred.JobID;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.oozie.WorkflowActionBean;
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;
@@ -275,7 +274,7 @@ public class TestSqoopActionExecutor ext
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);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, jobConf);
final RunningJob runningJob = jobClient.getJob(JobID.forName(jobId));
assertNotNull(runningJob);
return runningJob;
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
Mon Mar 12 22:36:48 2012
@@ -21,7 +21,6 @@ import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.Date;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobClient;
@@ -202,7 +201,7 @@ public class TestActionCheckXCommand ext
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
String launcherId = action.getExternalId();
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
Mon Mar 12 22:36:48 2012
@@ -158,7 +158,7 @@ public class TestActionStartXCommand ext
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
String launcherId = action.getExternalId();
@@ -220,7 +220,7 @@ public class TestActionStartXCommand ext
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
String launcherId = action.getExternalId();
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestAuthorizationService.java
Mon Mar 12 22:36:48 2012
@@ -23,7 +23,6 @@ import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.net.URI;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -138,7 +137,7 @@ public class TestAuthorizationService ex
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
URI uri = getFileSystem().getUri();
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fileSystem = has.createFileSystem(getTestUser(),
getTestGroup(), uri, fsConf);
+ FileSystem fileSystem = has.createFileSystem(getTestUser(), uri,
fsConf);
Path path = new Path(fileSystem.getWorkingDirectory(),
getTestCaseDir().substring(1));
Path fsTestDir = fileSystem.makeQualified(path);
@@ -238,7 +237,7 @@ public class TestAuthorizationService ex
HadoopAccessorService has =
Services.get().get(HadoopAccessorService.class);
URI uri = getFileSystem().getUri();
Configuration fsConf = has.createJobConf(uri.getAuthority());
- FileSystem fileSystem = has.createFileSystem(getTestUser(),
getTestGroup(), uri, fsConf);
+ FileSystem fileSystem = has.createFileSystem(getTestUser(), uri,
fsConf);
try {
as.authorizeForGroup(getTestUser3(), getTestGroup());
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestHadoopAccessorService.java
Mon Mar 12 22:36:48 2012
@@ -74,11 +74,11 @@ public class TestHadoopAccessorService e
String user = getTestUser();
String group = getTestGroup();
- JobClient jc = has.createJobClient(user, group, conf);
+ JobClient jc = has.createJobClient(user, conf);
assertNotNull(jc);
- FileSystem fs = has.createFileSystem(user, group, conf);
+ FileSystem fs = has.createFileSystem(user, conf);
assertNotNull(fs);
- fs = has.createFileSystem(user, group, uri, conf);
+ fs = has.createFileSystem(user, uri, conf);
assertNotNull(fs);
//invalid user
@@ -86,21 +86,21 @@ public class TestHadoopAccessorService e
user = "invalid";
try {
- has.createJobClient(user, group, conf);
+ has.createJobClient(user, conf);
fail();
}
catch (Throwable ex) {
}
try {
- has.createFileSystem(user, group, conf);
+ has.createFileSystem(user, conf);
fail();
}
catch (Throwable ex) {
}
try {
- has.createFileSystem(user, group, uri, conf);
+ has.createFileSystem(user, uri, conf);
fail();
}
catch (Throwable ex) {
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestLiteWorkflowAppService.java
Mon Mar 12 22:36:48 2012
@@ -88,7 +88,7 @@ public class TestLiteWorkflowAppService
injectKerberosInfo(conf);
WorkflowAppService wps = services.get(WorkflowAppService.class);
String wfDef = wps.readDefinition("file://" + getTestCaseDir() +
File.separator + "workflow.xml",
- getTestUser(), "group",
"authToken", conf);
+ getTestUser(), "authToken",
conf);
assertNotNull(reader.toString(), wfDef);
}
finally {
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
Mon Mar 12 22:36:48 2012
@@ -50,7 +50,6 @@ import org.apache.oozie.client.OozieClie
import org.apache.oozie.client.WorkflowAction;
import org.apache.oozie.client.WorkflowJob;
import org.apache.oozie.client.CoordinatorJob.Execution;
-import org.apache.oozie.command.wf.ActionStartXCommand;
import org.apache.oozie.command.wf.ActionXCommand;
import org.apache.oozie.command.wf.ActionXCommand.ActionExecutorContext;
import org.apache.oozie.executor.jpa.CoordActionGetJPAExecutor;
@@ -65,7 +64,6 @@ import org.apache.oozie.store.Coordinato
import org.apache.oozie.store.StoreException;
import org.apache.oozie.store.WorkflowStore;
import org.apache.oozie.test.XDataTestCase;
-import org.apache.oozie.test.XTestCase.Predicate;
import org.apache.oozie.util.DateUtils;
import org.apache.oozie.util.IOUtils;
import org.apache.oozie.util.XConfiguration;
@@ -214,7 +212,7 @@ public class TestRecoveryService extends
JobConf 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,
conf);
+ JobClient jobClient =
Services.get().get(HadoopAccessorService.class).createJobClient(user, conf);
String launcherId = action.getExternalId();
Modified:
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
---
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
(original)
+++
incubator/oozie/trunk/core/src/test/java/org/apache/oozie/test/XFsTestCase.java
Mon Mar 12 22:36:48 2012
@@ -70,7 +70,7 @@ public abstract class XFsTestCase extend
has.init(conf);
JobConf jobConf = has.createJobConf(getNameNodeUri());
XConfiguration.copy(conf, jobConf);
- fileSystem = has.createFileSystem(getTestUser(), getTestGroup(), new
URI(getNameNodeUri()), jobConf);
+ fileSystem = has.createFileSystem(getTestUser(), new
URI(getNameNodeUri()), jobConf);
Path path = new Path(fileSystem.getWorkingDirectory(),
getTestCaseDir().substring(1));
fsTestDir = fileSystem.makeQualified(path);
System.out.println(XLog.format("Setting FS testcase work dir[{0}]",
fsTestDir));
@@ -140,7 +140,7 @@ public abstract class XFsTestCase extend
conf.set("mapred.job.tracker", getJobTrackerUri());
conf.set("fs.default.name", getNameNodeUri());
injectKerberosInfo(conf);
- return has.createJobClient(getTestUser(), getTestGroup(), conf);
+ return has.createJobClient(getTestUser(), conf);
}
}
Modified: incubator/oozie/trunk/release-log.txt
URL:
http://svn.apache.org/viewvc/incubator/oozie/trunk/release-log.txt?rev=1299914&r1=1299913&r2=1299914&view=diff
==============================================================================
--- incubator/oozie/trunk/release-log.txt (original)
+++ incubator/oozie/trunk/release-log.txt Mon Mar 12 22:36:48 2012
@@ -1,5 +1,6 @@
-- Oozie 3.2.0 release
+OOZIE-754 remove use of group from HadoopAccessor (tucu)
OOZIE-752 if group.name/oozie.job.acl is not defined in job.properties job
submission fails (tucu)
OOZIE-753 default hadoop config file does not endup in the distro and hadoop
config doc typo (tucu)
OOZIE-747 HadoopAccessorService hadoop-configs should be loaded from Hadoop
-site.xml files (tucu)
