Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-4366 Some Adjustment to class names on Mirror 

This is in relation to comments from PR #4555
This commit is contained in:
Clebert Suconic 2023-07-18 09:30:45 -04:00 committed by clebertsuconic
parent 24dde9d4b5
commit 29deb30c73
5 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/ProtonProtocolManager.java
View File

@ -33,7 +33,7 @@ import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.core.server.management.Notification;
import org.apache.activemq.artemis.core.server.management.NotificationListener;
import org.apache.activemq.artemis.protocol.amqp.client.ProtonClientProtocolManager;
import org.apache.activemq.artemis.protocol.amqp.connect.mirror.ReferenceNodeStoreFactory;
import org.apache.activemq.artemis.protocol.amqp.connect.mirror.ReferenceIDSupplier;
import org.apache.activemq.artemis.protocol.amqp.proton.AMQPConnectionContext;
import org.apache.activemq.artemis.protocol.amqp.proton.AMQPConstants;
import org.apache.activemq.artemis.protocol.amqp.proton.AMQPRoutingHandler;
@ -73,9 +73,7 @@ public class ProtonProtocolManager extends AbstractProtocolManager<AMQPMessage,
private final ActiveMQServer server;
// We must use one referenceIDSupplier per server.
// protocol manager is the perfect aggregation for that.
private ReferenceNodeStoreFactory referenceIDSupplier;
private ReferenceIDSupplier referenceIDSupplier;
private final ProtonProtocolManagerFactory factory;
@ -125,11 +123,11 @@ public class ProtonProtocolManager extends AbstractProtocolManager<AMQPMessage,
routingHandler = new AMQPRoutingHandler(server);
}
public synchronized ReferenceNodeStoreFactory getReferenceIDSupplier() {
public synchronized ReferenceIDSupplier getReferenceIDSupplier() {
if (referenceIDSupplier == null) {
// we lazy start the instance.
// only create it when needed
referenceIDSupplier = new ReferenceNodeStoreFactory(server);
referenceIDSupplier = new ReferenceIDSupplier(server);
}
return referenceIDSupplier;
}

6
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerSource.java
View File

@ -92,7 +92,7 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
final Queue snfQueue;
final ActiveMQServer server;
final ReferenceNodeStoreFactory idSupplier;
final ReferenceIDSupplier idSupplier;
final boolean acks;
final boolean addQueues;
final boolean deleteQueues;
@ -324,14 +324,14 @@ public class AMQPMirrorControllerSource extends BasicMirrorController<Sender> im
}
}
public static void validateProtocolData(ReferenceNodeStoreFactory referenceIDSupplier, MessageReference ref, SimpleString snfAddress) {
public static void validateProtocolData(ReferenceIDSupplier referenceIDSupplier, MessageReference ref, SimpleString snfAddress) {
if (ref.getProtocolData(DeliveryAnnotations.class) == null && !ref.getMessage().getAddressSimpleString().equals(snfAddress)) {
setProtocolData(referenceIDSupplier, ref);
}
}
/** This method will return the brokerID used by the message */
private static String setProtocolData(ReferenceNodeStoreFactory referenceIDSupplier, MessageReference ref) {
private static String setProtocolData(ReferenceIDSupplier referenceIDSupplier, MessageReference ref) {
String brokerID = referenceIDSupplier.getServerID(ref);
long id = referenceIDSupplier.getID(ref);

3
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/AMQPMirrorControllerTarget.java
View File

@ -162,7 +162,7 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
DuplicateIDCache lruduplicateIDCache;
String lruDuplicateIDKey;
private final ReferenceNodeStoreFactory referenceNodeStore;
private final ReferenceIDSupplier referenceNodeStore;
OperationContext mirrorContext;
@ -374,7 +374,6 @@ public class AMQPMirrorControllerTarget extends ProtonAbstractReceiver implement
MessageReference reference = targetQueue.removeWithSuppliedID(nodeID, messageID, referenceNodeStore);
if (reference == null) {
if (logger.isDebugEnabled()) {
logger.debug("Retrying Reference not found on messageID={}, nodeID={}, queue={}. currentRetry={}", messageID, nodeID, targetQueue, retry);

16
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/ReferenceNodeStoreFactory.java → artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/ReferenceIDSupplier.java
View File

@ -26,18 +26,23 @@ import org.apache.activemq.artemis.utils.collections.NodeStoreFactory;
import static org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerSource.INTERNAL_BROKER_ID_EXTRA_PROPERTY;
import static org.apache.activemq.artemis.protocol.amqp.connect.mirror.AMQPMirrorControllerSource.INTERNAL_ID_EXTRA_PROPERTY;
public class ReferenceNodeStoreFactory implements NodeStoreFactory<MessageReference> {
/**
* Since Artemis 2.30.0 this is supplying a new NodeStore per queue.
* It is also parsing MessageReference and Message for the proper ID for the messages.
* @since 2.30.0
*/
public class ReferenceIDSupplier implements NodeStoreFactory<MessageReference> {
final ActiveMQServer server;
private final String serverID;
public ReferenceNodeStoreFactory(ActiveMQServer server) {
public ReferenceIDSupplier(ActiveMQServer server) {
this.server = server;
this.serverID = server.getNodeID().toString();
}
/** This will return the NodeStore that will be used by the Queue. */
@Override
public NodeStore<MessageReference> newNodeStore() {
return new ReferenceNodeStore(this);
@ -51,7 +56,6 @@ public class ReferenceNodeStoreFactory implements NodeStoreFactory<MessageRefere
return getServerID(element.getMessage());
}
public String getServerID(Message message) {
Object nodeID = message.getBrokerProperty(INTERNAL_BROKER_ID_EXTRA_PROPERTY);
if (nodeID != null) {
@ -77,6 +81,4 @@ public class ReferenceNodeStoreFactory implements NodeStoreFactory<MessageRefere
private Long getID(Message message) {
return (Long)message.getBrokerProperty(INTERNAL_ID_EXTRA_PROPERTY);
}
}
}

18
artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/connect/mirror/ReferenceNodeStore.java
View File

@ -26,10 +26,10 @@ import org.apache.activemq.artemis.utils.collections.LinkedListImpl;
public class ReferenceNodeStore implements NodeStore<MessageReference> {
private final ReferenceNodeStoreFactory factory;
private final ReferenceIDSupplier idSupplier;
public ReferenceNodeStore(ReferenceNodeStoreFactory factory) {
this.factory = factory;
public ReferenceNodeStore(ReferenceIDSupplier idSupplier) {
this.idSupplier = idSupplier;
}
// This is where the messages are stored by server id...
@ -67,7 +67,6 @@ public class ReferenceNodeStore implements NodeStore<MessageReference> {
}
}
@Override
public LinkedListImpl.Node<MessageReference> getNode(String serverID, long id) {
LongObjectHashMap<LinkedListImpl.Node<MessageReference>> nodeMap = getMap(serverID);
@ -82,7 +81,7 @@ public class ReferenceNodeStore implements NodeStore<MessageReference> {
/** notice getMap should always return an instance. It should never return null. */
private synchronized LongObjectHashMap<LinkedListImpl.Node<MessageReference>> getMap(String serverID) {
if (serverID == null) {
serverID = factory.getDefaultNodeID();
serverID = idSupplier.getDefaultNodeID();
}
if (lruListID != null && lruListID.equals(serverID)) {
@ -105,15 +104,15 @@ public class ReferenceNodeStore implements NodeStore<MessageReference> {
}
public String getServerID(MessageReference element) {
return factory.getServerID(element);
return idSupplier.getServerID(element);
}
public String getServerID(Message message) {
return factory.getServerID(message);
return idSupplier.getServerID(message);
}
public long getID(MessageReference element) {
return factory.getID(element);
return idSupplier.getID(element);
}
@Override
@ -132,5 +131,4 @@ public class ReferenceNodeStore implements NodeStore<MessageReference> {
}
return size;
}
}
}