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 2014/05/13 02:28:23 UTC
git commit: OOZIE-1690 TestShellActionExecutor#testEnvVar failed for
Windows (omaliuvanchuk via rkanter)
Repository: oozie
Updated Branches:
refs/heads/master 3e73f4e9a -> d77934462
OOZIE-1690 TestShellActionExecutor#testEnvVar failed for Windows (omaliuvanchuk via rkanter)
Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/d7793446
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/d7793446
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/d7793446
Branch: refs/heads/master
Commit: d779344622eae4b3dc1aa950d66010f440daa621
Parents: 3e73f4e
Author: Robert Kanter <rk...@cloudera.com>
Authored: Mon May 12 17:26:17 2014 -0700
Committer: Robert Kanter <rk...@cloudera.com>
Committed: Mon May 12 17:26:17 2014 -0700
----------------------------------------------------------------------
.../apache/oozie/action/hadoop/TestShellActionExecutor.java | 7 ++++++-
release-log.txt | 1 +
.../main/java/org/apache/oozie/action/hadoop/ShellMain.java | 4 ++++
3 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/d7793446/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
index 4a607a9..c59a263 100644
--- a/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/hadoop/TestShellActionExecutor.java
@@ -32,6 +32,7 @@ import org.apache.hadoop.util.Shell;
import org.apache.oozie.WorkflowActionBean;
import org.apache.oozie.WorkflowJobBean;
import org.apache.oozie.client.WorkflowAction;
+import org.apache.oozie.service.ActionService;
import org.apache.oozie.service.HadoopAccessorService;
import org.apache.oozie.service.Services;
import org.apache.oozie.service.WorkflowAppService;
@@ -170,6 +171,10 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
* @throws Exception
*/
public void testEnvVar() throws Exception {
+ Services.get().destroy();
+ Services services = new Services();
+ services.getConf().setInt(LauncherMapper.CONF_OOZIE_ACTION_MAX_OUTPUT_DATA, 8 * 1042);
+ services.init();
FileSystem fs = getFileSystem();
// Create the script file with canned shell command
@@ -189,7 +194,7 @@ public class TestShellActionExecutor extends ActionExecutorTestCase {
Context context = createContext(actionXml);
// Submit the action
final RunningJob launcherJob = submitAction(context);
- waitFor(30 * 1000, new Predicate() { // Wait for the external job to
+ waitFor(180 * 1000, new Predicate() { // Wait for the external job to
// finish
public boolean evaluate() throws Exception {
return launcherJob.isComplete();
http://git-wip-us.apache.org/repos/asf/oozie/blob/d7793446/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index b6cd061..1ef64b7 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1690 TestShellActionExecutor#testEnvVar failed for Windows (omaliuvanchuk via rkanter)
OOZIE-1243 libtools dir should not include hadoop JARs (sathish.mittal via rohini)
OOZIE-1806 Java Action type jobs are failing with hadoop-0.20.0 and earlier versions on oozie trunk (sathish.mittal via rohini)
OOZIE-1823 OozieSharelibCLI shouldn't load ext services (rkanter)
http://git-wip-us.apache.org/repos/asf/oozie/blob/d7793446/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
----------------------------------------------------------------------
diff --git a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
index cc72329..bb26c70 100644
--- a/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
+++ b/sharelib/oozie/src/main/java/org/apache/oozie/action/hadoop/ShellMain.java
@@ -31,6 +31,7 @@ import java.util.Map;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.util.Shell;
public class ShellMain extends LauncherMain {
public static final String CONF_OOZIE_SHELL_ARGS = "oozie.shell.args";
@@ -197,6 +198,9 @@ public class ShellMain extends LauncherMain {
System.out.println("Stdoutput " + line);
// 2. Writing for capture output
if (os != null) {
+ if (Shell.WINDOWS) {
+ line = line.replace("\\u", "\\\\u");
+ }
os.write(line);
os.newLine();
}