You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@oozie.apache.org by ro...@apache.org on 2014/07/07 23:59:40 UTC
git commit: OOZIE-1886 Queue operation talking longer time (shwethags
via rohini)
Repository: oozie
Updated Branches:
refs/heads/master 10e8ecc20 -> 0439fbb05
OOZIE-1886 Queue operation talking longer time (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/0439fbb0
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/0439fbb0
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/0439fbb0
Branch: refs/heads/master
Commit: 0439fbb057d1ecd32a5cea250481c63a6cfc3a96
Parents: 10e8ecc
Author: Rohini Palaniswamy <ro...@apache.org>
Authored: Mon Jul 7 14:59:34 2014 -0700
Committer: Rohini Palaniswamy <ro...@apache.org>
Committed: Mon Jul 7 14:59:34 2014 -0700
----------------------------------------------------------------------
.../apache/oozie/util/PriorityDelayQueue.java | 20 +++++++-------------
release-log.txt | 1 +
2 files changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/oozie/blob/0439fbb0/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java b/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
index a3f2148..1aad92e 100644
--- a/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
+++ b/core/src/main/java/org/apache/oozie/util/PriorityDelayQueue.java
@@ -349,20 +349,14 @@ public class PriorityDelayQueue<E> extends AbstractQueue<PriorityDelayQueue.Queu
if (!ignoreSize && currentSize != null && currentSize.get() >= maxSize) {
return false;
}
- boolean accepted;
- lock.lock();
- try {
- accepted = queues[queueElement.getPriority()].offer(queueElement);
- debug("offer([{0}]), to P[{1}] delay[{2}ms] accepted[{3}]", queueElement.getElement().toString(),
- queueElement.getPriority(), queueElement.getDelay(TimeUnit.MILLISECONDS), accepted);
- if (accepted) {
- if (currentSize != null) {
- currentSize.incrementAndGet();
- }
- queueElement.inQueue = true;
+ boolean accepted = queues[queueElement.getPriority()].offer(queueElement);
+ debug("offer([{0}]), to P[{1}] delay[{2}ms] accepted[{3}]", queueElement.getElement().toString(),
+ queueElement.getPriority(), queueElement.getDelay(TimeUnit.MILLISECONDS), accepted);
+ if (accepted) {
+ if (currentSize != null) {
+ currentSize.incrementAndGet();
}
- } finally {
- lock.unlock();
+ queueElement.inQueue = true;
}
return accepted;
}
http://git-wip-us.apache.org/repos/asf/oozie/blob/0439fbb0/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index eee06a4..5ac93f2 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 4.1.0 release (trunk - unreleased)
+OOZIE-1886 Queue operation talking longer time (shwethags via rohini)
OOZIE-1865 Oozie servers can't talk to each other with Oozie HA and Kerberos (rkanter)
OOZIE-1821 Oozie java action fails due to AlreadyBeingCreatedException (abhishek.agarwal via rkanter)
OOZIE-1532 Purging should remove completed children job for long running coordinator jobs (bzhang)