You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by mo...@apache.org on 2013/09/06 04:32:08 UTC
svn commit: r1520477 - in /oozie/trunk: ./
core/src/main/java/org/apache/oozie/action/hadoop/
core/src/test/java/org/apache/oozie/action/hadoop/
core/src/test/java/org/apache/oozie/command/wf/
core/src/test/java/org/apache/oozie/service/ sharelib/hive/...
Author: mona
Date: Fri Sep 6 02:32:08 2013
New Revision: 1520477
URL: http://svn.apache.org/r1520477
Log:
OOZIE-1520 Sequencefile Reader fails to use doas for reading action data file (rohini,mona via mona)
Modified:
oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
oozie/trunk/release-log.txt
oozie/trunk/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
oozie/trunk/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
Modified: oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java (original)
+++ oozie/trunk/core/src/main/java/org/apache/oozie/action/hadoop/LauncherMapperHelper.java Fri Sep 6 02:32:08 2013
@@ -24,6 +24,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.security.PrivilegedExceptionAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -37,10 +38,13 @@ import org.apache.hadoop.io.Text;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.hadoop.mapred.Counters;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.apache.oozie.client.OozieClient;
import org.apache.oozie.service.HadoopAccessorException;
import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.URIHandlerService;
+import org.apache.oozie.service.UserGroupInformationService;
public class LauncherMapperHelper {
@@ -225,26 +229,33 @@ public class LauncherMapperHelper {
* Utility function to load the contents of action data sequence file into
* memory object
*
- * @param fs FileSystem - HDFS
- * @param actionDir action directory
- * @param conf job conf
- * @param obj memory object
- * @param type type of action data
- * @param maxLen maximum allowed length of the data
- * @return the objectv (map)
+ * @param fs Action Filesystem
+ * @param actionDir Path
+ * @param conf Configuration
+ * @return Map action data
* @throws IOException
+ * @throws InterruptedException
*/
- public static Map<String, String> getActionData(FileSystem fs, Path actionDir, Configuration conf) throws IOException {
- Map<String, String> ret = new HashMap<String, String>();
- Path seqFilePath = getActionDataSequenceFilePath(actionDir);
- if (fs.exists(seqFilePath)) {
- SequenceFile.Reader seqFile = new SequenceFile.Reader(fs, seqFilePath, conf);
- Text key = new Text(), value = new Text();
- while (seqFile.next(key, value)) {
- ret.put(key.toString(), value.toString());
+ public static Map<String, String> getActionData(final FileSystem fs, final Path actionDir, final Configuration conf)
+ throws IOException, InterruptedException {
+ UserGroupInformationService ugiService = Services.get().get(UserGroupInformationService.class);
+ UserGroupInformation ugi = ugiService.getProxyUser(conf.get(OozieClient.USER_NAME));
+
+ return ugi.doAs(new PrivilegedExceptionAction<Map<String, String>>() {
+ @Override
+ public Map<String, String> run() throws IOException {
+ Map<String, String> ret = new HashMap<String, String>();
+ Path seqFilePath = getActionDataSequenceFilePath(actionDir);
+ if (fs.exists(seqFilePath)) {
+ SequenceFile.Reader seqFile = new SequenceFile.Reader(fs, seqFilePath, conf);
+ Text key = new Text(), value = new Text();
+ while (seqFile.next(key, value)) {
+ ret.put(key.toString(), value.toString());
+ }
+ seqFile.close();
+ }
+ return ret;
}
- seqFile.close();
- }
- return ret;
+ });
}
}
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestLauncher.java Fri Sep 6 02:32:08 2013
@@ -114,7 +114,9 @@ public class TestLauncher extends XFsTes
});
assertTrue(runningJob.isSuccessful());
- Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, new XConfiguration());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
+ Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf);
assertFalse(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir)));
assertTrue(LauncherMapperHelper.isMainDone(runningJob));
assertTrue(LauncherMapperHelper.isMainSuccessful(runningJob));
@@ -135,7 +137,9 @@ public class TestLauncher extends XFsTes
});
assertTrue(runningJob.isSuccessful());
- Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, new XConfiguration());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
+ Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf);
assertFalse(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir)));
assertTrue(LauncherMapperHelper.isMainDone(runningJob));
assertTrue(LauncherMapperHelper.isMainSuccessful(runningJob));
@@ -156,7 +160,9 @@ public class TestLauncher extends XFsTes
});
assertTrue(runningJob.isSuccessful());
- Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, new XConfiguration());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
+ Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf);
assertTrue(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir)));
assertTrue(LauncherMapperHelper.isMainDone(runningJob));
assertFalse(LauncherMapperHelper.isMainSuccessful(runningJob));
@@ -178,8 +184,9 @@ public class TestLauncher extends XFsTes
});
assertTrue(runningJob.isSuccessful());
-
- Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, new XConfiguration());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
+ Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf);
assertTrue(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir)));
assertTrue(LauncherMapperHelper.isMainDone(runningJob));
assertFalse(LauncherMapperHelper.isMainSuccessful(runningJob));
@@ -200,7 +207,9 @@ public class TestLauncher extends XFsTes
});
assertTrue(runningJob.isSuccessful());
- Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, new XConfiguration());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
+ Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf);
assertTrue(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir)));
assertTrue(LauncherMapperHelper.isMainDone(runningJob));
assertTrue(LauncherMapperHelper.isMainSuccessful(runningJob));
@@ -221,7 +230,9 @@ public class TestLauncher extends XFsTes
});
assertTrue(runningJob.isSuccessful());
- Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, new XConfiguration());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
+ Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf);
assertTrue(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir)));
assertTrue(LauncherMapperHelper.isMainDone(runningJob));
assertTrue(LauncherMapperHelper.isMainSuccessful(runningJob));
@@ -242,7 +253,9 @@ public class TestLauncher extends XFsTes
});
assertTrue(runningJob.isSuccessful());
- Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, new XConfiguration());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
+ Map<String, String> actionData = LauncherMapperHelper.getActionData(fs, actionDir, conf);
assertFalse(fs.exists(LauncherMapperHelper.getActionDataSequenceFilePath(actionDir)));
assertTrue(LauncherMapperHelper.isMainDone(runningJob));
assertTrue(LauncherMapperHelper.isMainSuccessful(runningJob));
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java Fri Sep 6 02:32:08 2013
@@ -274,8 +274,10 @@ public class TestShellActionExecutor ext
assertTrue(launcherJob.isSuccessful());
sleep(2000);// Wait more to make sure no ID swap happens
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertFalse(LauncherMapperHelper.hasIdSwap(actionData));
ShellActionExecutor ae = new ShellActionExecutor();
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java Fri Sep 6 02:32:08 2013
@@ -49,7 +49,6 @@ import org.apache.oozie.service.Services
import org.apache.oozie.service.UUIDService;
import org.apache.oozie.test.XDataTestCase;
import org.apache.oozie.util.Instrumentation;
-import org.apache.oozie.util.XConfiguration;
import org.apache.oozie.util.XmlUtils;
import org.apache.oozie.workflow.WorkflowInstance;
@@ -216,7 +215,7 @@ public class TestActionCheckXCommand ext
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
new ActionCheckXCommand(action.getId()).call();
@@ -328,7 +327,7 @@ public class TestActionCheckXCommand ext
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
new ActionCheckXCommand(actionId).call();
@@ -395,7 +394,7 @@ public class TestActionCheckXCommand ext
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
new ActionCheckXCommand(action1.getId()).call();
@@ -462,7 +461,7 @@ public class TestActionCheckXCommand ext
assertTrue(launcherJob2.isSuccessful());
actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
new ActionCheckXCommand(actionId).call();
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/command/wf/TestActionStartXCommand.java Fri Sep 6 02:32:08 2013
@@ -172,7 +172,7 @@ public class TestActionStartXCommand ext
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
}
@@ -238,7 +238,7 @@ public class TestActionStartXCommand ext
// check if launcher job succeeds
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
}
Modified: oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java
URL: http://svn.apache.org/viewvc/oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java (original)
+++ oozie/trunk/core/src/test/java/org/apache/oozie/service/TestRecoveryService.java Fri Sep 6 02:32:08 2013
@@ -242,7 +242,7 @@ public class TestRecoveryService extends
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
}
Modified: oozie/trunk/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/trunk/release-log.txt?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/release-log.txt (original)
+++ oozie/trunk/release-log.txt Fri Sep 6 02:32:08 2013
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1520 Sequencefile Reader fails to use doas for reading action data file (rohini,mona via mona)
OOZIE-1513 Workflow stays in running if Fork/join validation or loop detection fails (mona)
OOZIE-1490 Remove unix OS enforcement from build (dwann via tucu)
OOZIE-1372 When using uber mode, Oozie should also make the AM container size larger (ryota)
Modified: oozie/trunk/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java (original)
+++ oozie/trunk/sharelib/hive/src/test/java/org/apache/oozie/action/hadoop/TestHiveActionExecutor.java Fri Sep 6 02:32:08 2013
@@ -26,6 +26,8 @@ import java.io.StringReader;
import java.io.Writer;
import java.text.MessageFormat;
import java.util.Map;
+
+import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobClient;
@@ -172,8 +174,10 @@ public class TestHiveActionExecutor exte
}
});
assertTrue(launcherJob.isSuccessful());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertFalse(LauncherMapperHelper.hasIdSwap(actionData));
HiveActionExecutor ae = new HiveActionExecutor();
Modified: oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java (original)
+++ oozie/trunk/sharelib/pig/src/test/java/org/apache/oozie/action/hadoop/TestPigActionExecutor.java Fri Sep 6 02:32:08 2013
@@ -264,8 +264,10 @@ public class TestPigActionExecutor exten
evaluateLauncherJob(launcherJob);
assertTrue(launcherJob.isSuccessful());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasStatsData(actionData));
PigActionExecutor ae = new PigActionExecutor();
@@ -354,8 +356,10 @@ public class TestPigActionExecutor exten
evaluateLauncherJob(launcherJob);
assertTrue(launcherJob.isSuccessful());
+ Configuration conf = new XConfiguration();
+ conf.set("user.name", getTestUser());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertFalse(LauncherMapperHelper.hasStatsData(actionData));
PigActionExecutor ae = new PigActionExecutor();
Modified: oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java (original)
+++ oozie/trunk/sharelib/sqoop/src/test/java/org/apache/oozie/action/hadoop/TestSqoopActionExecutor.java Fri Sep 6 02:32:08 2013
@@ -226,7 +226,7 @@ public class TestSqoopActionExecutor ext
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ context.getProtoActionConf());
assertFalse(LauncherMapperHelper.hasIdSwap(actionData));
SqoopActionExecutor ae = new SqoopActionExecutor();
@@ -269,7 +269,7 @@ public class TestSqoopActionExecutor ext
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ context.getProtoActionConf());
assertFalse(LauncherMapperHelper.hasIdSwap(actionData));
SqoopActionExecutor ae = new SqoopActionExecutor();
@@ -301,7 +301,7 @@ public class TestSqoopActionExecutor ext
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ context.getProtoActionConf());
assertFalse(LauncherMapperHelper.hasIdSwap(actionData));
SqoopActionExecutor ae = new SqoopActionExecutor();
Modified: oozie/trunk/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java
URL: http://svn.apache.org/viewvc/oozie/trunk/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java?rev=1520477&r1=1520476&r2=1520477&view=diff
==============================================================================
--- oozie/trunk/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java (original)
+++ oozie/trunk/sharelib/streaming/src/test/java/org/apache/oozie/action/hadoop/TestMapReduceActionExecutor.java Fri Sep 6 02:32:08 2013
@@ -345,7 +345,7 @@ public class TestMapReduceActionExecutor
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ context.getProtoActionConf());
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
MapReduceActionExecutor ae = new MapReduceActionExecutor();
@@ -396,7 +396,7 @@ public class TestMapReduceActionExecutor
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ context.getProtoActionConf());
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
MapReduceActionExecutor ae = new MapReduceActionExecutor();
@@ -719,15 +719,17 @@ public class TestMapReduceActionExecutor
}
});
assertTrue(launcherJob.isSuccessful());
+
+ MapReduceActionExecutor ae = new MapReduceActionExecutor();
+ JobConf conf = ae.createBaseHadoopConf(context, XmlUtils.parseXml(actionXml));
+
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ conf);
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
- MapReduceActionExecutor ae = new MapReduceActionExecutor();
ae.check(context, context.getAction());
assertTrue(launcherId.equals(context.getAction().getExternalId()));
- 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, conf);
@@ -796,7 +798,7 @@ public class TestMapReduceActionExecutor
});
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ context.getProtoActionConf());
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
MapReduceActionExecutor ae = new MapReduceActionExecutor();
@@ -879,7 +881,7 @@ public class TestMapReduceActionExecutor
assertTrue(launcherJob.isSuccessful());
Map<String, String> actionData = LauncherMapperHelper.getActionData(getFileSystem(), context.getActionDir(),
- new XConfiguration());
+ context.getProtoActionConf());
assertTrue(LauncherMapperHelper.hasIdSwap(actionData));
// Assert launcher job name has been set
System.out.println("Launcher job name: " + launcherJob.getJobName());