You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2019/08/26 14:16:59 UTC
[activemq-artemis] branch master updated (34e2f40 -> 52c38fb)
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git.
from 34e2f40 This closes #2811
new dde6862 ARTEMIS-2457 fix non-destructive ring q test
new 354430c ARTEMIS-2457 speed up ring q tests
new 52c38fb This closes #2810
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 7 ++-----
.../activemq/artemis/tests/integration/server/RingQueueTest.java | 7 +++----
2 files changed, 5 insertions(+), 9 deletions(-)
[activemq-artemis] 01/03: ARTEMIS-2457 fix non-destructive ring q
test
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit dde6862aed8758c1f440086c6491581f94c6e73b
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Aug 26 08:30:49 2019 -0500
ARTEMIS-2457 fix non-destructive ring q test
---
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
index ea2ce33..a3b4809 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/QueueImpl.java
@@ -3514,12 +3514,9 @@ public class QueueImpl extends CriticalComponentImpl implements Queue {
queue.decDelivering(ref);
if (nonDestructive && reason == AckReason.NORMAL) {
- return;
- }
-
- // this is done to tell the difference between actual acks and just a closed consumer in the non-destructive use-case
- if (nonDestructive && reason == AckReason.NORMAL) {
+ // this is done to tell the difference between actual acks and just a closed consumer in the non-destructive use-case
ref.setInDelivery(false);
+ return;
}
if (reason == AckReason.EXPIRED) {
[activemq-artemis] 03/03: This closes #2810
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 52c38fbf7d50a11720566edd7c76a395e5f5afa4
Merge: 34e2f40 354430c
Author: Clebert Suconic <cl...@apache.org>
AuthorDate: Mon Aug 26 10:06:53 2019 -0400
This closes #2810
.../org/apache/activemq/artemis/core/server/impl/QueueImpl.java | 7 ++-----
.../activemq/artemis/tests/integration/server/RingQueueTest.java | 7 +++----
2 files changed, 5 insertions(+), 9 deletions(-)
[activemq-artemis] 02/03: ARTEMIS-2457 speed up ring q tests
Posted by cl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 354430ce3681492c4e7226d96bba7b5cf878a40c
Author: Justin Bertram <jb...@apache.org>
AuthorDate: Mon Aug 26 08:43:15 2019 -0500
ARTEMIS-2457 speed up ring q tests
---
.../activemq/artemis/tests/integration/server/RingQueueTest.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java
index 723b76e..7343b6b 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/server/RingQueueTest.java
@@ -182,14 +182,13 @@ public class RingQueueTest extends ActiveMQTestBase {
ClientMessage m0 = createTextMessage(clientSession, "hello0");
long time = System.currentTimeMillis();
- time += 3000;
+ time += 500;
m0.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time);
producer.send(m0);
Wait.assertTrue(() -> queue.getScheduledCount() == 1, 2000, 100);
Wait.assertTrue(() -> ((QueueImpl) queue).getMessageCountForRing() == 0, 2000, 100);
- Thread.sleep(1500);
time = System.currentTimeMillis();
- time += 3000;
+ time += 500;
m0.putLongProperty(Message.HDR_SCHEDULED_DELIVERY_TIME, time);
producer.send(m0);
Wait.assertTrue(() -> queue.getScheduledCount() == 2, 2000, 100);
@@ -327,7 +326,7 @@ public class RingQueueTest extends ActiveMQTestBase {
ClientConsumer consumer = clientSession.createConsumer(qName);
Wait.assertTrue(() -> queue.getDeliveringCount() == 1, 2000, 100);
consumer.close();
- Thread.sleep(3000);
+ Wait.assertTrue(() -> queue.getDeliveringCount() == 0, 2000, 100);
Wait.assertTrue(() -> queue.getMessageCount() == 1, 2000, 100);
}