You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by an...@apache.org on 2018/10/25 11:53:54 UTC

oozie git commit: OOZIE-3371 TestSubWorkflowActionExecutor#testSubWorkflowRerun() is flaky (andras.piros)

Repository: oozie
Updated Branches:
  refs/heads/master fdcd8908b -> 65936460e


OOZIE-3371 TestSubWorkflowActionExecutor#testSubWorkflowRerun() is flaky (andras.piros)

Change-Id: Ia199c7272ef040d5500cc007995ed5fc80b6416d


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/65936460
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/65936460
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/65936460

Branch: refs/heads/master
Commit: 65936460e263f9076bb552190be85396c2cc6d33
Parents: fdcd890
Author: Andras Piros <an...@cloudera.com>
Authored: Thu Oct 25 13:53:31 2018 +0200
Committer: Andras Piros <an...@cloudera.com>
Committed: Thu Oct 25 13:53:31 2018 +0200

----------------------------------------------------------------------
 .../apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java   | 2 +-
 release-log.txt                                                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/oozie/blob/65936460/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java b/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
index 7e21137..529a535 100644
--- a/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
+++ b/core/src/test/java/org/apache/oozie/action/oozie/TestSubWorkflowActionExecutor.java
@@ -568,7 +568,7 @@ public class TestSubWorkflowActionExecutor extends ActionExecutorTestCase {
             conf.setProperty(OozieClient.RERUN_FAIL_NODES, "true");
             wfClient.reRun(jobId,conf);
 
-            waitFor(JOB_TIMEOUT, new Predicate() {
+            waitFor(JOB_TIMEOUT * 2, new Predicate() {
                 public boolean evaluate() throws Exception {
                     return (wfClient.getJobInfo(jobId).getStatus() == WorkflowJob.Status.SUCCEEDED) &&
                             (wfClient.getJobInfo(jobId).getActions().get(2).getStatus() == WorkflowAction.Status.OK);

http://git-wip-us.apache.org/repos/asf/oozie/blob/65936460/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index 02fe7aa..684158c 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.2.0 release (trunk - unreleased)
 
+OOZIE-3371 TestSubWorkflowActionExecutor#testSubWorkflowRerun() is flaky (andras.piros)
 OOZIE-3365 Workflow and coordinator action status remains RUNNING after rerun (satishsaley)
 OOZIE-3361 [docs] Document embedded XML job submission mode (asalamon74 via andras.piros)
 OOZIE-3368 [fluent-job] CredentialsRetrying example does not compile (daniel.becker via andras.piros)