Skip to content

Management filtering and optimization #6226

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

Open
jbertram wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Management filtering and optimization #6226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fda9ac4
ARTEMIS-5782 allow searching on multiple attributes
andytaylor Feb 6, 2026
5d14885
ARTEMIS-5893 optimize ManagementService
andytaylor Dec 3, 2025
aa78c1b
ARTEMIS-5893 further optimize ManagementService
jbertram Feb 6, 2026
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
3 changes: 1 addition & 2 deletions ...erver/src/main/java/org/apache/activemq/artemis/jms/server/impl/JMSServerManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.api.core.management.ResourceNames;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.api.jms.JMSFactoryType;
import org.apache.activemq.artemis.core.config.Configuration;
Expand Down Expand Up @@ -783,7 +782,7 @@ public synchronized boolean destroyTopic(final String name) throws Exception {
@Override
public synchronized boolean destroyTopic(final String name, final boolean removeConsumers) throws Exception {
checkInitialised();
AddressControl addressControl = (AddressControl) server.getManagementService().getResource(ResourceNames.ADDRESS + name);
AddressControl addressControl = server.getManagementService().getAddressControl(name);
if (addressControl != null) {
for (String queueName : addressControl.getAllQueueNames()) {
Binding binding = server.getPostOffice().getBinding(SimpleString.of(queueName));
Expand Down
54 changes: 30 additions & 24 deletions ...org/apache/activemq/artemis/protocol/amqp/connect/bridge/AMQPBridgeManagementSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ public static void registerBridgeManager(AMQPBridgeManager bridge) throws Except
final ManagementService management = server.getManagementService();
final AMQPBridgeManagerControlType control = new AMQPBridgeManagerControlType(server, bridge);

management.registerInJMX(getBridgeManagerObjectName(management, brokerConnectionName, bridgeName), control);
management.registerInRegistry(getBridgeManagerResourceName(brokerConnectionName, bridgeName), control);
management.registerUntypedControl(getBridgeManagerResourceName(brokerConnectionName, bridgeName),
control,
getBridgeManagerObjectName(management, brokerConnectionName, bridgeName));
}

/**
Expand All @@ -127,8 +128,8 @@ public static void unregisterBridgeManager(AMQPBridgeManager bridge) throws Exce
final ActiveMQServer server = bridge.getServer();
final ManagementService management = server.getManagementService();

management.unregisterFromJMX(getBridgeManagerObjectName(management, brokerConnectionName, bridgeName));
management.unregisterFromRegistry(getBridgeManagerResourceName(brokerConnectionName, bridgeName));
management.unregisterUntypedControl(getBridgeManagerResourceName(brokerConnectionName, bridgeName),
getBridgeManagerObjectName(management, brokerConnectionName, bridgeName));
}

public static String getBridgeManagerResourceName(String brokerConnectionName, String bridgeName) {
Expand Down Expand Up @@ -159,8 +160,9 @@ public static void registerBridgePolicyManager(AMQPBridgePolicyManager manager)
final String bridgeName = bridgeManager.getName();
final String policyName = manager.getPolicyName();

management.registerInJMX(getBridgePolicyManagerObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName), control);
management.registerInRegistry(getBridgePolicyManagerResourceName(brokerConnectionName, bridgeName, policyName), control);
management.registerUntypedControl(getBridgePolicyManagerResourceName(brokerConnectionName, bridgeName, policyName),
control,
getBridgePolicyManagerObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName));
}

/**
Expand All @@ -179,8 +181,8 @@ public static void unregisterBridgePolicyManager(AMQPBridgePolicyManager manager
final String bridgeName = bridgeManager.getName();
final String policyName = manager.getPolicyName();

management.unregisterFromJMX(getBridgePolicyManagerObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName));
management.unregisterFromRegistry(getBridgePolicyManagerResourceName(brokerConnectionName, bridgeName, policyName));
management.unregisterUntypedControl(getBridgePolicyManagerResourceName(brokerConnectionName, bridgeName, policyName),
getBridgePolicyManagerObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName));
}

public static String getBridgePolicyManagerResourceName(String brokerConnectionName, String bridgeName, String policyName) {
Expand Down Expand Up @@ -215,11 +217,13 @@ public static void registerBridgeReceiver(AMQPBridgeReceiver receiver) throws Ex
final String policyName = manager.getPolicyName();

if (receiver.getRole() == ReceiverRole.ADDRESS_RECEIVER) {
management.registerInJMX(getBridgeAddressReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalAddress()), control);
management.registerInRegistry(getBridgeAddressReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalAddress()), control);
management.registerUntypedControl(getBridgeAddressReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalAddress()),
control,
getBridgeAddressReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalAddress()));
} else {
management.registerInJMX(getBridgeQueueReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalFqqn()), control);
management.registerInRegistry(getBridgeQueueReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalFqqn()), control);
management.registerUntypedControl(getBridgeQueueReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalFqqn()),
control,
getBridgeQueueReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalFqqn()));
}
}

Expand All @@ -241,11 +245,11 @@ public static void unregisterBridgeReceiver(AMQPBridgeReceiver receiver) throws
final String policyName = manager.getPolicyName();

if (receiver.getRole() == ReceiverRole.ADDRESS_RECEIVER) {
management.unregisterFromJMX(getBridgeAddressReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalAddress()));
management.unregisterFromRegistry(getBridgeAddressReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalAddress()));
management.unregisterUntypedControl(getBridgeAddressReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalAddress()),
getBridgeAddressReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalAddress()));
} else {
management.unregisterFromJMX(getBridgeQueueReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalFqqn()));
management.unregisterFromRegistry(getBridgeQueueReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalFqqn()));
management.unregisterUntypedControl(getBridgeQueueReceiverResourceName(brokerConnectionName, bridgeName, policyName, receiver.getReceiverInfo().getLocalFqqn()),
getBridgeQueueReceiverObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, receiver.getReceiverInfo().getLocalFqqn()));
}
}

Expand Down Expand Up @@ -298,13 +302,15 @@ public static void registerBridgeSender(AMQPBridgeToSenderController sender) thr
if (sender.getRole() == SenderRole.ADDRESS_SENDER) {
final String address = control.getAddress();

management.registerInJMX(getBridgeAddressSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, address), control);
management.registerInRegistry(getBridgeAddressSenderResourceName(brokerConnectionName, bridgeName, policyName, address), control);
management.registerUntypedControl(getBridgeAddressSenderResourceName(brokerConnectionName, bridgeName, policyName, address),
control,
getBridgeAddressSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, address));
} else {
final String fqqn = control.getFqqn();

management.registerInJMX(getBridgeQueueSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, fqqn), control);
management.registerInRegistry(getBridgeQueueSenderResourceName(brokerConnectionName, bridgeName, policyName, fqqn), control);
management.registerUntypedControl(getBridgeQueueSenderResourceName(brokerConnectionName, bridgeName, policyName, fqqn),
control,
getBridgeQueueSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, fqqn));
}
}

Expand All @@ -328,13 +334,13 @@ public static void unregisterBridgeSender(AMQPBridgeToSenderController sender) t
if (sender.getRole() == SenderRole.ADDRESS_SENDER) {
final String address = sender.getServerConsumer().getQueueAddress().toString();

management.unregisterFromJMX(getBridgeAddressSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, address));
management.unregisterFromRegistry(getBridgeAddressSenderResourceName(brokerConnectionName, bridgeName, policyName, address));
management.unregisterUntypedControl(getBridgeAddressSenderResourceName(brokerConnectionName, bridgeName, policyName, address),
getBridgeAddressSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, address));
} else {
final String fqqn = CompositeAddress.toFullyQualified(sender.getServerConsumer().getQueueAddress().toString(), sender.getServerConsumer().getQueueName().toString());

management.unregisterFromJMX(getBridgeQueueSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, fqqn));
management.unregisterFromRegistry(getBridgeQueueSenderResourceName(brokerConnectionName, bridgeName, policyName, fqqn));
management.unregisterUntypedControl(getBridgeQueueSenderResourceName(brokerConnectionName, bridgeName, policyName, fqqn),
getBridgeQueueSenderObjectName(management, brokerConnectionName, bridgeName, manager.getPolicyType().toString(), policyName, fqqn));
}
}

Expand Down
Loading