Repository: oozie Updated Branches: refs/heads/master 41312e956 -> 7779f3184
OOZIE-2556 TestAbandonedCoordChecker.testCatchupJob is flaky Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/7779f318 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/7779f318 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/7779f318 Branch: refs/heads/master Commit: 7779f3184a085a832df3116a0eab33d2d56eed78 Parents: 41312e9 Author: Purshotam Shah <[email protected]> Authored: Tue Jun 7 10:04:28 2016 -0700 Committer: Purshotam Shah <[email protected]> Committed: Tue Jun 7 10:04:28 2016 -0700 ---------------------------------------------------------------------- .../oozie/command/coord/TestAbandonedCoordChecker.java | 13 +++++++------ release-log.txt | 1 + 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/7779f318/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java b/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java index 7837b52..0b10e3c 100644 --- a/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java +++ b/core/src/test/java/org/apache/oozie/command/coord/TestAbandonedCoordChecker.java @@ -48,7 +48,8 @@ public class TestAbandonedCoordChecker extends XDataTestCase { public void tesAbandonedFailed() throws Exception { Date start = DateUtils.addMonths(new Date(), -1); - Date end = new Date(start.getTime() + (4 * 60 * 60 * 1000)); // 4 hrs + Date end = DateUtils.addHours(new Date(), 4); // 4 hrs + Date createdTime = start; final CoordinatorJobBean job1 = addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, @@ -69,7 +70,7 @@ public class TestAbandonedCoordChecker extends XDataTestCase { public void testNoAbandoned() throws Exception { Date start = DateUtils.addMonths(new Date(), -1); - Date end = new Date(start.getTime() + (4 * 60 * 60 * 1000)); // 4 hrs + Date end = DateUtils.addHours(new Date(), 4); // 4 hrs Date createdTime = start; @@ -92,7 +93,7 @@ public class TestAbandonedCoordChecker extends XDataTestCase { public void testMessage_withTimedout() throws Exception { Date start = DateUtils.addMonths(new Date(), -1); - Date end = new Date(start.getTime() + (4 * 60 * 60 * 1000)); // 4 hrs + Date end = DateUtils.addHours(new Date(), 4); // 4 hrs Date createdTime = start; final CoordinatorJobBean job1 = addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, @@ -114,7 +115,7 @@ public class TestAbandonedCoordChecker extends XDataTestCase { public void testMessage_withMixedStatus() throws Exception { Date start = DateUtils.addMonths(new Date(), -1); - Date end = new Date(start.getTime() + (4 * 60 * 60 * 1000)); // 4 hrs + Date end = DateUtils.addHours(new Date(), 4); // 4 hrs Date createdTime = start; final CoordinatorJobBean job1 = addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, @@ -144,7 +145,7 @@ public class TestAbandonedCoordChecker extends XDataTestCase { public void testKill() throws Exception { Date start = DateUtils.addMonths(new Date(), -1); - Date end = new Date(start.getTime() + (4 * 60 * 60 * 1000)); // 4 hrs + Date end = DateUtils.addHours(new Date(), 4); // 4 hrs Date createdTime = start; CoordinatorJobBean job1 = addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, createdTime, @@ -185,7 +186,7 @@ public class TestAbandonedCoordChecker extends XDataTestCase { public void testCatchupJob() throws Exception { Date start = DateUtils.addMonths(new Date(), -1); - Date end = new Date(start.getTime() + (4 * 60 * 60 * 1000)); // 4 hrs + Date end = DateUtils.addHours(new Date(), 4); // 4 hrs Date createdTime = DateUtils.addDays(new Date(), -1); CoordinatorJobBean job1 = addRecordToCoordJobTable(CoordinatorJob.Status.RUNNING, start, end, createdTime, http://git-wip-us.apache.org/repos/asf/oozie/blob/7779f318/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 33626b1..2f69344 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.3.0 release (trunk - unreleased) +OOZIE-2556 TestAbandonedCoordChecker.testCatchupJob is flaky (puru) OOZIE-2522 There can be multiple coord submit from bundle in case of ZK glitch (puru) OOZIE-2553 Cred tag is required for all actions in the workflow even if an action does not require it (me.venkatr via rohini) OOZIE-2503 show ChildJobURLs to spark action (satishsaley via puru)
