This is an automated email from the ASF dual-hosted git repository.
mattrpav pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/main by this push:
new 467ef36972 [#] Fix flaky test TopicSubscriptionEnableExpiryTest.java
467ef36972 is described below
commit 467ef369722796eff7ed0196a40d1c9ee63c6cea
Author: Matt Pavlovich <[email protected]>
AuthorDate: Mon Jul 13 07:16:35 2026 -0500
[#] Fix flaky test TopicSubscriptionEnableExpiryTest.java
---
.../region/TopicSubscriptionEnableExpiryTest.java | 35 ++++++++++++++++++----
1 file changed, 29 insertions(+), 6 deletions(-)
diff --git
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java
index 4dcc34e574..688243ef4a 100644
---
a/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java
+++
b/activemq-unit-tests/src/test/java/org/apache/activemq/broker/region/TopicSubscriptionEnableExpiryTest.java
@@ -38,6 +38,7 @@ import org.apache.activemq.test.annotations.ParallelTest;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
/**
* Tests correctness of the {@code ExpiryCheckEnabled} feature on
@@ -246,9 +247,12 @@ public class TopicSubscriptionEnableExpiryTest {
* <li>Sending 250 messages with a very short TTL.
* <li>Waiting for all TTLs to elapse.
* <li>Sending one more message (triggers the code path).
- * <li>Asserting that the broker's expired-message counter is 0
- * (no expiry scan ran) while the discarded counter is > 0
- * (normal eviction ran as expected).
+ * <li>Asserting that the slow-consumer backlog was cleared by the normal
+ * eviction strategy (discarded > 0) rather than the eager expiry
scan,
+ * i.e. eviction dominates any incidental expiry (expired <
discarded).
+ * The expired counter is not asserted to be exactly zero because the
+ * always-on expiry paths (per-message dispatch check, client
expired-acks)
+ * may still expire a small, timing-dependent number of messages.
* </ol>
*/
@Test
@@ -288,9 +292,28 @@ public class TopicSubscriptionEnableExpiryTest {
Destination dest = broker.getDestination(new
ActiveMQTopic("TEST.EXPIRY.DISABLED"));
long expiredCount =
dest.getDestinationStatistics().getExpired().getCount();
- assertEquals(
- "With ExpiryCheckEnabled=false, the expiry scan must not
run — expired counter must be 0",
- 0L, expiredCount);
+ // The ExpiryCheckEnabled flag only skips the eager
removeExpiredMessages() scan in
+ // TopicSubscription.add(); it does NOT disable the always-on
expiry paths (the per-message
+ // isExpired() check when dispatching to the consumer, and client
expired-acks), which may
+ // still expire a small, timing-dependent number of messages. So
the expired counter is not
+ // reliably zero. The feature's actual guarantee is that the
slow-consumer backlog is cleared
+ // by the normal eviction strategy instead of the expiry scan —
assert that eviction did the
+ // work and dominates any incidental expiry.
+ TopicSubscription sub = null;
+ for (Subscription s : dest.getConsumers()) {
+ if (s instanceof TopicSubscription) {
+ sub = (TopicSubscription) s;
+ break;
+ }
+ }
+ assertNotNull("expected a TopicSubscription on the destination",
sub);
+ int evictedCount = sub.discarded();
+
+ assertTrue("eviction must clear the slow-consumer backlog when the
eager expiry scan is "
+ + "disabled (evicted=" + evictedCount + ")", evictedCount
> 0);
+ assertTrue("with the eager expiry scan disabled, eviction - not
the expiry scan - must clear "
+ + "the backlog (expired=" + expiredCount + ", evicted=" +
evictedCount + ")",
+ expiredCount < evictedCount);
conn.close();
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
