Author: mona
Date: Wed Nov 7 00:15:17 2012
New Revision: 1406408
URL: http://svn.apache.org/viewvc?rev=1406408&view=rev
Log:
Applying trunk patches to hcat-intre branch to maintain sync
Modified:
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/test/XTestCase.java
oozie/branches/hcat-intre/distro/src/main/bin/oozied.sh
oozie/branches/hcat-intre/release-log.txt
Modified:
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1406408&r1=1406407&r2=1406408&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
(original)
+++
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
Wed Nov 7 00:15:17 2012
@@ -239,6 +239,10 @@ public class TestActionCheckXCommand ext
}
public void testActionCheckTransientDuringLauncher() throws Exception {
+ // When using YARN, skip this test because it relies on shutting down
the job tracker, which isn't used in YARN
+ if (createJobConf().get("yarn.resourcemanager.address") != null) {
+ return;
+ }
services.destroy();
// Make the ActionCheckXCommand run more frequently so the test won't
take as long
setSystemProperty("oozie.service.ActionCheckerService.action.check.interval",
"10");
@@ -345,6 +349,10 @@ public class TestActionCheckXCommand ext
}
public void testActionCheckTransientDuringMRAction() throws Exception {
+ // When using YARN, skip this test because it relies on shutting down
the job tracker, which isn't used in YARN
+ if (createJobConf().get("yarn.resourcemanager.address") != null) {
+ return;
+ }
services.destroy();
// Make the ActionCheckXCommand run more frequently so the test won't
take as long
setSystemProperty("oozie.service.ActionCheckerService.action.check.interval",
"10");
Modified:
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/test/XTestCase.java
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/test/XTestCase.java?rev=1406408&r1=1406407&r2=1406408&view=diff
==============================================================================
---
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/test/XTestCase.java
(original)
+++
oozie/branches/hcat-intre/core/src/test/java/org/apache/oozie/test/XTestCase.java
Wed Nov 7 00:15:17 2012
@@ -414,6 +414,11 @@ public abstract class XTestCase extends
throw new RuntimeException(XLog.format("could not delete path
[{0}]", file.getAbsolutePath()));
}
}
+ else {
+ // With a dangling symlink, exists() doesn't return true so try to
delete it anyway; we fail silently in case the file
+ // truely doesn't exist
+ file.delete();
+ }
}
/**
Modified: oozie/branches/hcat-intre/distro/src/main/bin/oozied.sh
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/distro/src/main/bin/oozied.sh?rev=1406408&r1=1406407&r2=1406408&view=diff
==============================================================================
--- oozie/branches/hcat-intre/distro/src/main/bin/oozied.sh (original)
+++ oozie/branches/hcat-intre/distro/src/main/bin/oozied.sh Wed Nov 7 00:15:17
2012
@@ -66,6 +66,9 @@ setup_catalina_opts() {
catalina_opts="${catalina_opts} -Doozie.http.port=${OOZIE_HTTP_PORT}";
catalina_opts="${catalina_opts} -Doozie.base.url=${OOZIE_BASE_URL}";
+ # add required native libraries such as compression codecs
+ catalina_opts="${catalina_opts} -Djava.library.path=${JAVA_LIBRARY_PATH}";
+
echo "Adding to CATALINA_OPTS: ${catalina_opts}"
export CATALINA_OPTS="${CATALINA_OPTS} ${catalina_opts}"
Modified: oozie/branches/hcat-intre/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/hcat-intre/release-log.txt?rev=1406408&r1=1406407&r2=1406408&view=diff
==============================================================================
--- oozie/branches/hcat-intre/release-log.txt (original)
+++ oozie/branches/hcat-intre/release-log.txt Wed Nov 7 00:15:17 2012
@@ -1,5 +1,8 @@
-- Oozie 3.4.0 release (trunk - unreleased)
-
+OOZIE-1048 Enable propagation of native libraries as a VM argument using
java.library.path (venkatesh via tucu)
+OOZIE-1011 Tests from OOZIE-994 fail when run against Hadoop trunk (rkanter
via tucu)
+OOZIE-1037 XTestCase.delete() can cause tests to fail if it runs into a
dangling symlink (rkanter via tucu)
+OOZIE-1014 Coordinator action failure error not propagated (mona)
OOZIE-1042 Coordinator action table schema change. (Mohammad)
OOZIE-959 Use API from OOZIE-906 in console (Ashish via Mohammad)
OOZIE-1036 Utility class to parse HCat URI (Ryota via Mohammad)
