Skip to content

[6.2.x] Refactor network connections to process after ConnectionInfo (#2112)#2116

Merged
cshannon merged 1 commit into
apache:activemq-6.2.xfrom
cshannon:backport-2112-6.2.x
Jun 15, 2026
Merged

[6.2.x] Refactor network connections to process after ConnectionInfo (#2112)#2116
cshannon merged 1 commit into
apache:activemq-6.2.xfrom
cshannon:backport-2112-6.2.x

Conversation

@cshannon

Copy link
Copy Markdown
Contributor

This refactors the setup for network connections to be processed after receiving ConnectionInfo. Network bridges are established by each broker sending a BrokerInfo command to the other broker to provide remote broker information, but this is done before ConnectionInfo. This commit reworks the connection to capture the BrokerInfo information, but delay processing until after the connection information has been received and processed by broker.addConnection(). The future that was previously added for the connection id is no longer needed and removed.

This commit also simplifies durable sync for bridges and prevents a race condition on startup by making sure the initial bridge and the duplex side only send back the BrokerSubscriptionInfo command after fully initialized.

(cherry picked from commit 230db1f)

…2112)

This refactors the setup for network connections to be processed
after receiving ConnectionInfo. Network bridges are established by
each broker sending a BrokerInfo command to the other broker to provide
remote broker information, but this is done before ConnectionInfo.
This commit reworks the connection to capture the BrokerInfo information,
but delay processing until after the connection information has been
received and processed by broker.addConnection(). The future that was
previously added for the connection id is no longer needed and removed.

This commit also simplifies durable sync for bridges and prevents a
race condition on startup by making sure the initial bridge and the
duplex side only send back the BrokerSubscriptionInfo command after
fully initialized.

(cherry picked from commit 230db1f)
@cshannon cshannon self-assigned this Jun 15, 2026
@cshannon cshannon merged commit 7116758 into apache:activemq-6.2.x Jun 15, 2026
3 of 4 checks passed
@cshannon cshannon deleted the backport-2112-6.2.x branch June 15, 2026 17:18
@github-project-automation github-project-automation Bot moved this from Todo to Done in Apache ActiveMQ v6.2.7 Jun 15, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

Development

Successfully merging this pull request may close these issues.

1 participant