Author: mona
Date: Wed Nov 21 05:15:07 2012
New Revision: 1411987
URL: http://svn.apache.org/viewvc?rev=1411987&view=rev
Log:
Backport OOZIE-1005 to branch-3.3 and remove stray commit lines from
graphWF.xml and invalidGraphWF.xml
Modified:
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml
oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml
oozie/branches/branch-3.3/release-log.txt
Modified:
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java?rev=1411987&r1=1411986&r2=1411987&view=diff
==============================================================================
---
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
(original)
+++
oozie/branches/branch-3.3/core/src/test/java/org/apache/oozie/command/wf/TestActionCheckXCommand.java
Wed Nov 21 05:15:07 2012
@@ -268,11 +268,18 @@ public class TestActionCheckXCommand ext
assertEquals(0, action1.getRetries());
new ActionCheckXCommand(actionId).call();
+ waitFor(30 * 1000, new Predicate() {
+ @Override
+ public boolean evaluate() throws Exception {
+ WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
+ return (action1a.getRetries() > 0);
+ }
+ });
waitFor(180 * 1000, new Predicate() {
@Override
public boolean evaluate() throws Exception {
WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
- return (action1a.getRetries() == maxRetries + 1);
+ return (action1a.getRetries() == 0);
}
});
WorkflowActionBean action1b =
jpaService.execute(wfActionGetCmd);
@@ -390,11 +397,18 @@ public class TestActionCheckXCommand ext
assertEquals(0, action1.getRetries());
new ActionCheckXCommand(actionId).call();
+ waitFor(30 * 1000, new Predicate() {
+ @Override
+ public boolean evaluate() throws Exception {
+ WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
+ return (action1a.getRetries() > 0);
+ }
+ });
waitFor(180 * 1000, new Predicate() {
@Override
public boolean evaluate() throws Exception {
WorkflowActionBean action1a =
jpaService.execute(wfActionGetCmd);
- return (action1a.getRetries() == maxRetries + 1);
+ return (action1a.getRetries() == 0);
}
});
WorkflowActionBean action1b =
jpaService.execute(wfActionGetCmd);
Modified: oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml?rev=1411987&r1=1411986&r2=1411987&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml (original)
+++ oozie/branches/branch-3.3/core/src/test/resources/graphWF.xml Wed Nov 21
05:15:07 2012
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<<<<<<< HEAD
-=======
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
->>>>>>> 028ab12... OOZIE-1013 Build failing as the license header comment is
appearing before xml declaration in some files (virag)
<workflow-app xmlns="uri:oozie:workflow:0.2" name="sm3-segment-3908-251483">
<start to="or_0_1"/>
<kill name="kill">
Modified: oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml?rev=1411987&r1=1411986&r2=1411987&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml
(original)
+++ oozie/branches/branch-3.3/core/src/test/resources/invalidGraphWF.xml Wed
Nov 21 05:15:07 2012
@@ -1,6 +1,4 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<<<<<<< HEAD
-=======
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +16,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
->>>>>>> 028ab12... OOZIE-1013 Build failing as the license header comment is
appearing before xml declaration in some files (virag)
<workflow-app xmlns="uri:oozie:workflow:0.2" name="sm3-segment-3908-251483">
<start to="or_0_1"/>
<kill name="kill">
Modified: oozie/branches/branch-3.3/release-log.txt
URL:
http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1411987&r1=1411986&r2=1411987&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Wed Nov 21 05:15:07 2012
@@ -1,5 +1,6 @@
-- Oozie 3.3.0 release
+OOZIE-1005 Tests from OOZIE-994 use wrong condition in waitFor (rkanter via
virag)
OOZIE-994 ActionCheckXCommand does not handle failures properly(rkanter via
mohammad)
OOZIE-1058 ACL modify-job should not be hardcoded to group name(mona via
mohammad)
OOZIE-1052 HadoopAccessorService.createFileSystem throws exception in
map-reduce action, failing workflow.(ryota via mohammad).
