Author: rkanter
Date: Thu Apr 18 01:02:48 2013
New Revision: 1469114
URL: http://svn.apache.org/r1469114
Log:
OOZIE-1332 Flakey test
TestActionCheckXCommand.testActionCheckTransientDuringMRAction (rkanter)
Modified:
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
oozie/branches/branch-4.0/release-log.txt
Modified:
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1469114&r1=1469113&r2=1469114&view=diff
==============================================================================
---
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
(original)
+++
oozie/branches/branch-4.0/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
Thu Apr 18 01:02:48 2013
@@ -245,13 +245,12 @@ public class TestActionCheckXCommand ext
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");
-
setSystemProperty("oozie.service.ActionCheckerService.action.check.delay",
"20");
// Make the max number of retries lower so the test won't take as long
final int maxRetries = 2;
setSystemProperty("oozie.action.retries.max",
Integer.toString(maxRetries));
services = new Services();
+ // Disable ActionCheckerService so it doesn't interfere by triggering
any extra ActionCheckXCommands
+ setClassesToBeExcluded(services.getConf(), new
String[]{"org.apache.oozie.service.ActionCheckerService"});
services.init();
final JPAService jpaService = Services.get().get(JPAService.class);
@@ -355,13 +354,12 @@ public class TestActionCheckXCommand ext
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");
-
setSystemProperty("oozie.service.ActionCheckerService.action.check.delay",
"20");
// Make the max number of retries lower so the test won't take as long
final int maxRetries = 2;
setSystemProperty("oozie.action.retries.max",
Integer.toString(maxRetries));
services = new Services();
+ // Disable ActionCheckerService so it doesn't interfere by triggering
any extra ActionCheckXCommands
+ setClassesToBeExcluded(services.getConf(), new
String[]{"org.apache.oozie.service.ActionCheckerService"});
services.init();
final JPAService jpaService = Services.get().get(JPAService.class);
Modified: oozie/branches/branch-4.0/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-4.0/release-log.txt?rev=1469114&r1=1469113&r2=1469114&view=diff
==============================================================================
--- oozie/branches/branch-4.0/release-log.txt (original)
+++ oozie/branches/branch-4.0/release-log.txt Thu Apr 18 01:02:48 2013
@@ -1,5 +1,6 @@
-- Oozie 4.0.0 (unreleased)
+OOZIE-1332 Flakey test
TestActionCheckXCommand.testActionCheckTransientDuringMRAction (rkanter)
OOZIE-1150 DB upgrade scripts for hcat changes (ryota via virag)
OOZIE-1323 HTTPS docs lists the same step twice for creating a self-signed
certificate (rkanter)
OOZIE-1292 Add Hadoop 0.23 Poms in hadooplibs to enable a build/tests against
branch 0.23 (mona)
