Skip to content

Fix flaky NetworkAdvancedStatisticsTest race condition #1960

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattrpav merged 1 commit into from
Apr 23, 2026
+9 −2
Merged

Fix flaky NetworkAdvancedStatisticsTest race condition #1960

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions ...q-unit-tests/src/test/java/org/apache/activemq/network/NetworkAdvancedStatisticsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,15 @@ public void onMessage(Message message) {
assertTrue(Wait.waitFor(new Condition() {
@Override
public boolean isSatisified() throws Exception {
// The number of message that remain is due to the exclude queue
return receivedMessages.size() == MESSAGE_COUNT;
// Check if messages arrived at the consumer
boolean messagesReceived = receivedMessages.size() == MESSAGE_COUNT;

// Check if the asynchronous broker statistics have settled
long localDequeues = localBroker.getDestination(includedDestination).getDestinationStatistics().getDequeues().getCount();
long remoteEnqueues = remoteBroker.getDestination(includedDestination).getDestinationStatistics().getEnqueues().getCount();

// The test can only proceed when BOTH the messages are received and the stats match
return messagesReceived && localDequeues == MESSAGE_COUNT && remoteEnqueues == MESSAGE_COUNT;
}
}, 30000, 500));

Expand Down