Updated Branches: refs/heads/master 937f19edc -> 073b0eb13
OOZIE-1664 PollablePriorityDelayQueue.poll() returns elements with +ve delay (shwethags via rohini) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/073b0eb1 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/073b0eb1 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/073b0eb1 Branch: refs/heads/master Commit: 073b0eb134f45f15439841702d57e4ba2787dc1a Parents: 937f19e Author: Rohini Palaniswamy <[email protected]> Authored: Fri Jan 10 08:23:22 2014 -0800 Committer: Rohini Palaniswamy <[email protected]> Committed: Fri Jan 10 08:23:22 2014 -0800 ---------------------------------------------------------------------- .../java/org/apache/oozie/util/PollablePriorityDelayQueue.java | 2 +- .../java/org/apache/oozie/service/TestCallableQueueService.java | 4 +++- release-log.txt | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/073b0eb1/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java b/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java index 4ff9c5d..6645544 100644 --- a/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java +++ b/core/src/main/java/org/apache/oozie/util/PollablePriorityDelayQueue.java @@ -57,7 +57,7 @@ public class PollablePriorityDelayQueue<E> extends PriorityDelayQueue<E> { Iterator<QueueElement<E>> iter = queues[i - 1].iterator(); while(e == null && iter.hasNext()) { e = iter.next(); - if (eligibleToPoll(e)) { + if (e.getDelay(TimeUnit.MILLISECONDS) <= 0 && eligibleToPoll(e)) { queues[i - 1].remove(e); } else { http://git-wip-us.apache.org/repos/asf/oozie/blob/073b0eb1/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java b/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java index a171608..903866d 100644 --- a/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java +++ b/core/src/test/java/org/apache/oozie/service/TestCallableQueueService.java @@ -400,7 +400,8 @@ public class TestCallableQueueService extends XTestCase { List<MyCallable> callables = Arrays.asList(callable1, callable2, callable3, callable4, callable5, callable6); final MyCallable callableOther = new MyCallable("other", 0, 100); - queueservice.queue(callableOther, 1000); + long now = System.currentTimeMillis(); + queueservice.queue(callableOther, 15); for (MyCallable c : callables) { queueservice.queue(c, 10); @@ -430,6 +431,7 @@ public class TestCallableQueueService extends XTestCase { System.out.println("Callable callableOther executed :" + callableOther.executed); assertTrue(callableOther.executed < last); + assertTrue(callableOther.executed > (now + 115)); } public void testSerialConcurrencyLimit() throws Exception { http://git-wip-us.apache.org/repos/asf/oozie/blob/073b0eb1/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 01a9d66..62572e9 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 4.1.0 release (trunk - unreleased) +OOZIE-1664 PollablePriorityDelayQueue.poll() returns elements with +ve delay (shwethags via rohini) OOZIE-1661 Stream logs in oozie UI (puru via rohini) OOZIE-1610 UnitTests fail on Windows because of wrong paths (omaliuvanchuk via rohini) OOZIE-1660 DB connection misconfig causes all or most unit tests to fail (rkanter)
