(test/fix) race condition in network bridge advisory subscription initialization in AMQ6366Test#1895
Merged
cshannon merged 1 commit intoapache:mainfrom Apr 9, 2026
Merged
Conversation
cshannon
approved these changes
Apr 9, 2026
Contributor
cshannon
left a comment
There was a problem hiding this comment.
@gurpartap3697 - Thanks for the fix! I noticed this the other day on a couple of my PRs but didn't get a chance to look at it yet.
Contributor
|
I'll let the GH actions run before merging just in case |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR fixes a race condition in the network bridge setup that cause missed advisory messages and prevent durable demand subscriptions from being created.
waitForBridgeFormation()returned as soon asremoteBrokerNamewas set duringcollectBrokerInfos()and this occurs beforestartRemoteBridge()registers the advisory consumer onconBroker.In some cases following sequence occur:
waitForBridgeFormation()returns earlysub1is createdpubBrokerThe fix ensures proper synchronization by waiting until the bridge’s advisory consumer is fully registered before proceeding. Now, it wait for at least one topic-region subscription on 1conBroker1
Error
ref - https://github.com/apache/activemq/actions/runs/23763076486/job/69370689090
Test
Ran test locally over 50 times with 100% success rate. Previously, test was failing consistently 5 out of 50 times (10% failure rate).