Reduce contention on the AMQ Store

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@618981 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/broker/region/DurableTopicSubscription.java

@@ -277,4 +277,8 @@ public class DurableTopicSubscription extends PrefetchSubscription implements Us
             }
         }
     }
+    
+    protected boolean isDropped(MessageReference node) {
+       return false;
+     }
 }

activemq-core/src/main/java/org/apache/activemq/broker/region/PrefetchSubscription.java

@@ -452,7 +452,10 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
                             if (node == null) {
                                 break;
                             }
-                            if (canDispatch(node)) {
+                            if(isDropped(node)) {
+                                pending.remove();
+                            }
+                            else if (canDispatch(node)) {
                                 pending.remove();
                                 // Message may have been sitting in the pending
                                 // list a while waiting for the consumer to ak the message.
@@ -575,6 +578,8 @@ public abstract class PrefetchSubscription extends AbstractSubscription {
      */
     protected abstract boolean canDispatch(MessageReference node) throws IOException;
     
+    protected abstract boolean isDropped(MessageReference node);
+
     /**
      * Used during acknowledgment to remove the message.
      * 

activemq-core/src/main/java/org/apache/activemq/broker/region/QueueSubscription.java

@@ -205,4 +205,14 @@ public class QueueSubscription extends PrefetchSubscription implements LockOwner
     public void destroy() {
     }
 
+   
+    protected boolean isDropped(MessageReference node) {
+       boolean result = false;
+       if(node instanceof IndirectMessageReference) {
+           QueueMessageReference qmr = (QueueMessageReference) node;
+           result = qmr.isDropped();
+       }
+       return result;
+    }
+
 }

activemq-core/src/main/java/org/apache/activemq/broker/region/cursors/AbstractStoreCursor.java

@@ -38,6 +38,7 @@ import org.apache.commons.logging.LogFactory;
  */
 public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor implements MessageRecoveryListener, UsageListener {
     private static final Log LOG = LogFactory.getLog(AbstractStoreCursor.class);
+    protected static final int MAX_FILL_ATTEMPTS=3;
     protected final Destination regionDestination;
     protected final LinkedHashMap<MessageId,Message> batchList = new LinkedHashMap<MessageId,Message> ();
     protected boolean cacheEnabled=false;
@@ -180,7 +181,10 @@ public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor i
             resetBatch();
             this.batchResetNeeded = false;
         }
-        while (this.batchList.isEmpty() && (this.storeHasMessages || size > 0)) {
+        //we may have to move the store cursor past messages that have 
+        //already been delivered - but we also don't want it to spin
+        int fillAttempts=0;
+        while (fillAttempts < MAX_FILL_ATTEMPTS && this.batchList.isEmpty() && (this.storeHasMessages ||this.size >0)) {
             this.storeHasMessages = false;
             try {
                 doFillBatch();
@@ -191,6 +195,7 @@ public abstract class AbstractStoreCursor extends AbstractPendingMessageCursor i
             if (!this.batchList.isEmpty()) {
                 this.storeHasMessages=true;
             }
+            fillAttempts++;
         }
     }
     

activemq-core/src/main/java/org/apache/activemq/store/ReferenceStore.java

@@ -18,6 +18,7 @@
 package org.apache.activemq.store;
 
 import java.io.IOException;
+import java.util.concurrent.locks.Lock;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.MessageId;
@@ -83,4 +84,6 @@ public interface ReferenceStore extends MessageStore {
 
     void setBatch(MessageId startAfter);
     
+    Lock getStoreLock();
+    
 }

activemq-core/src/main/java/org/apache/activemq/store/amq/AMQMessageStore.java

@@ -29,6 +29,7 @@ import java.util.Set;
 import java.util.Map.Entry;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.concurrent.locks.Lock;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
@@ -78,9 +79,11 @@ public class AMQMessageStore implements MessageStore {
     private Map<MessageId, ReferenceData> cpAddedMessageIds;
     private final boolean debug = LOG.isDebugEnabled();
     private final AtomicReference<Location> mark = new AtomicReference<Location>();
+    protected final Lock lock;
 
     public AMQMessageStore(AMQPersistenceAdapter adapter,ReferenceStore referenceStore, ActiveMQDestination destination) {
         this.peristenceAdapter = adapter;
+        this.lock=referenceStore.getStoreLock();
         this.transactionStore = adapter.getTransactionStore();
         this.referenceStore = referenceStore;
         this.destination = destination;
@@ -99,7 +102,7 @@ public class AMQMessageStore implements MessageStore {
     }
 
     /**
-     * Not synchronized since the Journal has better throughput if you increase
+     * Not synchronize since the Journal has better throughput if you increase
      * the number of concurrent writes that it is doing.
      */
     public final void addMessage(ConnectionContext context, final Message message) throws IOException {
@@ -114,8 +117,11 @@ public class AMQMessageStore implements MessageStore {
             if (debug) {
                 LOG.debug("Journalled transacted message add for: " + id + ", at: " + location);
             }
-            synchronized (this) {
+            lock.lock();
+            try {
                 inFlightTxLocations.add(location);
+            }finally {
+                lock.unlock();
             }
             transactionStore.addMessage(this, message, location);
             context.getTransaction().addSynchronization(new Synchronization() {
@@ -124,8 +130,11 @@ public class AMQMessageStore implements MessageStore {
                     if (debug) {
                         LOG.debug("Transacted message add commit for: " + id + ", at: " + location);
                     }
-                    synchronized (AMQMessageStore.this) {
+                    lock.lock();
+                    try {
                         inFlightTxLocations.remove(location);
+                    }finally {
+                        lock.unlock();
                     }
                     addMessage(message, location);
                 }
@@ -134,8 +143,11 @@ public class AMQMessageStore implements MessageStore {
                     if (debug) {
                         LOG.debug("Transacted message add rollback for: " + id + ", at: " + location);
                     }
-                    synchronized (AMQMessageStore.this) {
+                    lock.lock();
+                    try {
                         inFlightTxLocations.remove(location);
+                    }finally {
+                        lock.unlock();
                     }
                 }
             });
@@ -147,10 +159,13 @@ public class AMQMessageStore implements MessageStore {
         data.setExpiration(message.getExpiration());
         data.setFileId(location.getDataFileId());
         data.setOffset(location.getOffset());
-        synchronized (this) {
+         lock.lock();
+         try {
             lastLocation = location;
             messages.put(message.getMessageId(), data);
             this.peristenceAdapter.addInProgressDataFile(this, location.getDataFileId());
+        }finally {
+            lock.unlock();
         }
         if (messages.size() > this.peristenceAdapter
                 .getMaxCheckpointMessageAddSize()) {
@@ -199,8 +214,11 @@ public class AMQMessageStore implements MessageStore {
             if (debug) {
                 LOG.debug("Journalled transacted message remove for: " + ack.getLastMessageId() + ", at: " + location);
             }
-            synchronized (this) {
+            lock.lock();
+            try {
                 inFlightTxLocations.add(location);
+            }finally {
+                lock.unlock();
             }
             transactionStore.removeMessage(this, ack, location);
             context.getTransaction().addSynchronization(new Synchronization() {
@@ -209,9 +227,12 @@ public class AMQMessageStore implements MessageStore {
                     if (debug) {
                         LOG.debug("Transacted message remove commit for: " + ack.getLastMessageId() + ", at: " + location);
                     }
-                    synchronized (AMQMessageStore.this) {
+                    lock.lock();
+                    try {
                         inFlightTxLocations.remove(location);
                         removeMessage(ack,location);
+                    }finally {
+                        lock.unlock();
                     }
                 }
 
@@ -219,8 +240,11 @@ public class AMQMessageStore implements MessageStore {
                     if (debug) {
                         LOG.debug("Transacted message remove rollback for: " + ack.getLastMessageId() + ", at: " + location);
                     }
-                    synchronized (AMQMessageStore.this) {
+                    lock.lock();
+                    try {
                         inFlightTxLocations.remove(location);
+                    }finally {
+                        lock.unlock();
                     }
                 }
             });
@@ -229,13 +253,16 @@ public class AMQMessageStore implements MessageStore {
 
     final void removeMessage(final MessageAck ack, final Location location) throws InterruptedIOException {
         ReferenceData data;
-        synchronized (this) {
+        lock.lock();
+        try{
             lastLocation = location;
             MessageId id = ack.getLastMessageId();
             data = messages.remove(id);
             if (data == null) {
                 messageAcks.add(ack);
             }
+        }finally {
+            lock.unlock();
         }
         if (messageAcks.size() > this.peristenceAdapter.getMaxCheckpointMessageAddSize()) {
             flush();
@@ -273,7 +300,8 @@ public class AMQMessageStore implements MessageStore {
             LOG.debug("flush starting ...");
         }
         CountDownLatch countDown;
-        synchronized (this) {
+        lock.lock();
+        try {
             if (lastWrittenLocation == lastLocation) {
                 return;
             }
@@ -281,6 +309,8 @@ public class AMQMessageStore implements MessageStore {
                 flushLatch = new CountDownLatch(1);
             }
             countDown = flushLatch;
+        }finally {
+            lock.unlock();
         }
         try {
             asyncWriteTask.wakeup();
@@ -300,9 +330,12 @@ public class AMQMessageStore implements MessageStore {
     void asyncWrite() {
         try {
             CountDownLatch countDown;
-            synchronized (this) {
+            lock.lock();
+            try {
                 countDown = flushLatch;
                 flushLatch = null;
+            }finally {
+                lock.unlock();
             }
             mark.set(doAsyncWrite());
             if (countDown != null) {
@@ -323,13 +356,16 @@ public class AMQMessageStore implements MessageStore {
         final int maxCheckpointMessageAddSize = peristenceAdapter.getMaxCheckpointMessageAddSize();
         final Location lastLocation;
         // swap out the message hash maps..
-        synchronized (this) {
+        lock.lock();
+        try {
             cpAddedMessageIds = this.messages;
             cpRemovedMessageLocations = this.messageAcks;
             cpActiveJournalLocations = new ArrayList<Location>(inFlightTxLocations);
             this.messages = new LinkedHashMap<MessageId, ReferenceData>();
             this.messageAcks = new ArrayList<MessageAck>();
             lastLocation = this.lastLocation;
+        }finally {
+            lock.unlock();
         }
         if (LOG.isDebugEnabled()) {
             LOG.debug("Doing batch update... adding: " + cpAddedMessageIds.size() + " removing: " + cpRemovedMessageLocations.size() + " ");
@@ -371,9 +407,12 @@ public class AMQMessageStore implements MessageStore {
             }
         });
         LOG.debug("Batch update done.");
-        synchronized (this) {
+        lock.lock();
+        try {
             cpAddedMessageIds = null;
             lastWrittenLocation = lastLocation;
+        }finally {
+            lock.unlock();
         }
         if (cpActiveJournalLocations.size() > 0) {
             Collections.sort(cpActiveJournalLocations);
@@ -403,12 +442,15 @@ public class AMQMessageStore implements MessageStore {
     
     protected Location getLocation(MessageId messageId) throws IOException {
         ReferenceData data = null;
-        synchronized (this) {
+        lock.lock();
+        try {
             // Is it still in flight???
             data = messages.get(messageId);
             if (data == null && cpAddedMessageIds != null) {
                 data = cpAddedMessageIds.get(messageId);
             }
+        }finally {
+            lock.unlock();
         }
         if (data == null) {
             data = referenceStore.getMessageReference(messageId);
@@ -483,11 +525,11 @@ public class AMQMessageStore implements MessageStore {
     }
 
     public void recoverNextMessages(int maxReturned, MessageRecoveryListener listener) throws Exception {
-        /*
           RecoveryListenerAdapter recoveryListener = new RecoveryListenerAdapter(
                 this, listener);
         if (referenceStore.supportsExternalBatchControl()) {
-            synchronized (this) {
+            lock.lock();
+            try {
                 referenceStore.recoverNextMessages(maxReturned,
                         recoveryListener);
                 if (recoveryListener.size() == 0 && recoveryListener.hasSpace()) {
@@ -505,18 +547,21 @@ public class AMQMessageStore implements MessageStore {
                     referenceStore.setBatch(recoveryListener
                             .getLastRecoveredMessageId());
                 }
+            }finally {
+                lock.unlock();
             }
         } else {
             flush();
             referenceStore.recoverNextMessages(maxReturned, recoveryListener);
         }
-        */
+        /*
         RecoveryListenerAdapter recoveryListener = new RecoveryListenerAdapter(this, listener);
         referenceStore.recoverNextMessages(maxReturned, recoveryListener);
         if (recoveryListener.size() == 0 && recoveryListener.hasSpace()) {
             flush();
             referenceStore.recoverNextMessages(maxReturned, recoveryListener);
         }
+        */
        
     }
 

activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java

@@ -30,6 +30,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.ReentrantLock;
 
 import org.apache.activeio.journal.Journal;
 import org.apache.activemq.broker.BrokerService;

activemq-core/src/main/java/org/apache/activemq/store/amq/AMQTopicMessageStore.java

@@ -17,10 +17,6 @@
 package org.apache.activemq.store.amq;
 
 import java.io.IOException;
-import java.io.InterruptedIOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQTopic;
@@ -33,7 +29,6 @@ import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.TopicMessageStore;
 import org.apache.activemq.store.TopicReferenceStore;
 import org.apache.activemq.transaction.Synchronization;
-import org.apache.activemq.util.Callback;
 import org.apache.activemq.util.SubscriptionKey;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -98,8 +93,11 @@ public class AMQTopicMessageStore extends AMQMessageStore implements TopicMessag
             if (debug) {
                 LOG.debug("Journalled transacted acknowledge for: " + messageId + ", at: " + location);
             }
-            synchronized (this) {
+            lock.lock();
+            try {
                 inFlightTxLocations.add(location);
+            }finally {
+                lock.unlock();
             }
             transactionStore.acknowledge(this, ack, location);
             context.getTransaction().addSynchronization(new Synchronization() {
@@ -108,9 +106,12 @@ public class AMQTopicMessageStore extends AMQMessageStore implements TopicMessag
                     if (debug) {
                         LOG.debug("Transacted acknowledge commit for: " + messageId + ", at: " + location);
                     }
-                    synchronized (AMQTopicMessageStore.this) {
+                    lock.lock();
+                    try {
                         inFlightTxLocations.remove(location);
                         acknowledge(context,messageId, location, clientId,subscriptionName);
+                    }finally {
+                        lock.unlock();
                     }
                 }
 
@@ -118,8 +119,11 @@ public class AMQTopicMessageStore extends AMQMessageStore implements TopicMessag
                     if (debug) {
                         LOG.debug("Transacted acknowledge rollback for: " + messageId + ", at: " + location);
                     }
-                    synchronized (AMQTopicMessageStore.this) {
+                    lock.lock();
+                    try{
                         inFlightTxLocations.remove(location);
+                    }finally {
+                        lock.unlock();
                     }
                 }
             });
@@ -149,8 +153,12 @@ public class AMQTopicMessageStore extends AMQMessageStore implements TopicMessag
             Location location, String clientId, String subscriptionName)
             throws IOException {
         MessageAck ack = null;
-        synchronized (this) {
+        lock.lock();
+        try {
             lastLocation = location;
+        }finally {
+            lock.unlock();
+        }
         
             if (topicReferenceStore.acknowledgeReference(context, clientId,
                     subscriptionName, messageId)) {
@@ -158,7 +166,7 @@ public class AMQTopicMessageStore extends AMQMessageStore implements TopicMessag
                 ack.setLastMessageId(messageId);
                
             }
-        }
+        
         if (ack != null) {
             removeMessage(context, ack);
         }

activemq-core/src/main/java/org/apache/activemq/store/amq/RecoveryListenerAdapter.java

@@ -55,9 +55,7 @@ final class RecoveryListenerAdapter implements MessageRecoveryListener {
         if (message != null) {
             return recoverMessage(message);
         } else {
-            if (LOG.isDebugEnabled()) {
+            LOG.error("Message id " + ref + " could not be recovered from the data store - already dispatched");
-                LOG.debug("Message id " + ref + " could not be recovered from the data store - already dispatched");
-            }
         }
         return false;
     }

activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStore.java

@@ -17,6 +17,9 @@
 package org.apache.activemq.store.kahadaptor;
 
 import java.io.IOException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.Message;
@@ -26,10 +29,12 @@ import org.apache.activemq.kaha.MapContainer;
 import org.apache.activemq.kaha.StoreEntry;
 import org.apache.activemq.store.MessageRecoveryListener;
 import org.apache.activemq.store.ReferenceStore;
-import org.apache.activemq.store.ReferenceStore.ReferenceData;
 import org.apache.activemq.usage.MemoryUsage;
-import org.apache.activemq.usage.SystemUsage;
 
+/**
+ * @author rajdavies
+ *
+ */
 public class KahaReferenceStore implements ReferenceStore {
 
     protected final ActiveMQDestination destination;
@@ -37,6 +42,7 @@ public class KahaReferenceStore implements ReferenceStore {
     protected KahaReferenceStoreAdapter adapter;
     private StoreEntry batchEntry;
     private String lastBatchId;
+    protected final Lock lock = new ReentrantLock();
 
     public KahaReferenceStore(KahaReferenceStoreAdapter adapter, MapContainer<MessageId, ReferenceRecord> container,
                               ActiveMQDestination destination) throws IOException {
@@ -45,6 +51,10 @@ public class KahaReferenceStore implements ReferenceStore {
         this.destination = destination;
     }
     
+    public Lock getStoreLock() {
+        return lock;
+    }
+
     public void start() {
     }
 
@@ -55,11 +65,11 @@ public class KahaReferenceStore implements ReferenceStore {
         return new MessageId(((ReferenceRecord)object).getMessageId());
     }
 
-    public synchronized void addMessage(ConnectionContext context, Message message) throws IOException {
+    public void addMessage(ConnectionContext context, Message message) throws IOException {
         throw new RuntimeException("Use addMessageReference instead");
     }
 
-    public synchronized Message getMessage(MessageId identity) throws IOException {
+    public Message getMessage(MessageId identity) throws IOException {
         throw new RuntimeException("Use addMessageReference instead");
     }
 
@@ -73,7 +83,9 @@ public class KahaReferenceStore implements ReferenceStore {
         return false;
     }
 
-    public synchronized void recover(MessageRecoveryListener listener) throws Exception {
+    public void recover(MessageRecoveryListener listener) throws Exception {
+        lock.lock();
+        try {
             for (StoreEntry entry = messageContainer.getFirst(); entry != null; entry = messageContainer
                 .getNext(entry)) {
                 ReferenceRecord record = messageContainer.getValue(entry);
@@ -81,10 +93,15 @@ public class KahaReferenceStore implements ReferenceStore {
                     break;
                 }
             }
+        }finally {
+            lock.unlock();
+        }
     }
 
-    public synchronized void recoverNextMessages(int maxReturned, MessageRecoveryListener listener)
+    public void recoverNextMessages(int maxReturned, MessageRecoveryListener listener)
         throws Exception {
+        lock.lock();
+        try {
             StoreEntry entry = batchEntry;
             if (entry == null) {
                 entry = messageContainer.getFirst();
@@ -110,21 +127,34 @@ public class KahaReferenceStore implements ReferenceStore {
                     entry = messageContainer.getNext(entry);
                 } while (entry != null && count < maxReturned && listener.hasSpace());
             }
+        }finally {
+            lock.unlock();
+        }
     }
 
-    public synchronized void addMessageReference(ConnectionContext context, MessageId messageId,
+    public void addMessageReference(ConnectionContext context, MessageId messageId,
                                                  ReferenceData data) throws IOException {
+        lock.lock();
+        try {
             ReferenceRecord record = new ReferenceRecord(messageId.toString(), data);
             messageContainer.put(messageId, record);
             addInterest(record);
+        }finally {
+            lock.unlock();
+        }
     }
 
-    public synchronized ReferenceData getMessageReference(MessageId identity) throws IOException {
+    public ReferenceData getMessageReference(MessageId identity) throws IOException {
+        lock.lock();
+        try {
             ReferenceRecord result = messageContainer.get(identity);
             if (result == null) {
                 return null;
             }
             return result.getData();
+        }finally {
+            lock.unlock();
+        }
     }
     
     public void addReferenceFileIdsInUse() {
@@ -139,7 +169,9 @@ public class KahaReferenceStore implements ReferenceStore {
         removeMessage(ack.getLastMessageId());
     }
 
-    public synchronized void removeMessage(MessageId msgId) throws IOException {    
+    public void removeMessage(MessageId msgId) throws IOException {  
+        lock.lock();
+        try {
             StoreEntry entry = messageContainer.getEntry(msgId);
             if (entry != null) {
                 ReferenceRecord rr = messageContainer.remove(msgId);
@@ -152,23 +184,42 @@ public class KahaReferenceStore implements ReferenceStore {
                     }
                 }
             }
+        }finally {
+            lock.unlock();
+        }
     }
 
-    public synchronized void removeAllMessages(ConnectionContext context) throws IOException {
+    public void removeAllMessages(ConnectionContext context) throws IOException {
+        lock.lock();
+        try {
             messageContainer.clear();
+        }finally {
+            lock.unlock();
+        }
+        
     }
 
     public ActiveMQDestination getDestination() {
         return destination;
     }
 
-    public synchronized void delete() {
+    public void delete() {
+        lock.lock();
+        try {
             messageContainer.clear();
+        }finally {
+            lock.unlock();
+        }
     }
 
-    public synchronized void resetBatching() {
+    public void resetBatching() {
+        lock.lock();
+        try {
             batchEntry = null;
             lastBatchId = null;
+        }finally {
+            lock.unlock();
+        }
     }
 
     public int getMessageCount() {

activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaReferenceStoreAdapter.java

@@ -25,6 +25,7 @@ import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
@@ -177,7 +178,7 @@ public class KahaReferenceStoreAdapter extends KahaPersistenceAdapter implements
         }
         return rc;
     }
-
+/*
     public void buildReferenceFileIdsInUse() throws IOException {
         recordReferences = new HashMap<Integer, AtomicInteger>();
         Set<ActiveMQDestination> destinations = getDestinations();
@@ -191,6 +192,7 @@ public class KahaReferenceStoreAdapter extends KahaPersistenceAdapter implements
             }
         }
     }
+    */
 
     protected MapContainer<MessageId, ReferenceRecord> getMapReferenceContainer(Object id,
                                                                                 String containerName)
@@ -249,6 +251,7 @@ public class KahaReferenceStoreAdapter extends KahaPersistenceAdapter implements
      * @throws IOException
      * @see org.apache.activemq.store.ReferenceStoreAdapter#recoverState()
      */
+   
     public void recoverState() throws IOException {
         for (Iterator<SubscriptionInfo> i = durableSubscribers.iterator(); i.hasNext();) {
             SubscriptionInfo info = i.next();

activemq-core/src/main/java/org/apache/activemq/store/kahadaptor/KahaTopicReferenceStore.java

@@ -20,6 +20,7 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
 
 import org.apache.activemq.broker.ConnectionContext;
 import org.apache.activemq.command.ActiveMQDestination;
@@ -62,16 +63,18 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
         return new MessageId(((ReferenceRecord)object).getMessageId());
     }
 
-    public synchronized void addMessage(ConnectionContext context, Message message) throws IOException {
+    public void addMessage(ConnectionContext context, Message message) throws IOException {
         throw new RuntimeException("Use addMessageReference instead");
     }
 
-    public synchronized Message getMessage(MessageId identity) throws IOException {
+    public Message getMessage(MessageId identity) throws IOException {
         throw new RuntimeException("Use addMessageReference instead");
     }
 
-    public synchronized void addMessageReference(final ConnectionContext context, final MessageId messageId,
+    public  void addMessageReference(final ConnectionContext context, final MessageId messageId,
                                     final ReferenceData data) {
+        lock.lock();
+        try {
             final ReferenceRecord record = new ReferenceRecord(messageId.toString(), data);
             final int subscriberCount = subscriberMessages.size();
             if (subscriberCount > 0) {
@@ -90,6 +93,9 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
                     container.add(ref);
                 }
             }
+        }finally {
+            lock.unlock();
+        }
     }
 
     public ReferenceData getMessageReference(final MessageId identity) throws IOException {
@@ -121,10 +127,12 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
         return container;
     }
 
-    public synchronized boolean acknowledgeReference(ConnectionContext context,
+    public boolean acknowledgeReference(ConnectionContext context,
             String clientId, String subscriptionName, MessageId messageId)
             throws IOException {
         boolean removeMessage = false;
+        lock.lock();
+            try {
             String key = getSubscriptionKey(clientId, subscriptionName);
     
             TopicSubContainer container = subscriberMessages.get(key);
@@ -152,15 +160,19 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
                     removeMessage = true;
                 }
             }
+        }finally {
+            lock.unlock();
+        }
         return removeMessage;
 
     }
     
-    public synchronized void acknowledge(ConnectionContext context,
+    public void acknowledge(ConnectionContext context,
 			String clientId, String subscriptionName, MessageId messageId)
 			throws IOException {
 		String key = getSubscriptionKey(clientId, subscriptionName);
-
+		lock.lock();
+		try {
     		TopicSubContainer container = subscriberMessages.get(key);
     		if (container != null) {
                 ConsumerMessageRef ref = container.remove(messageId);
@@ -185,10 +197,15 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
                     }
                 }
             }
+		}finally {
+		    lock.unlock();
+		}
 	}
 
-    public synchronized void addSubsciption(SubscriptionInfo info, boolean retroactive) throws IOException {
+    public void addSubsciption(SubscriptionInfo info, boolean retroactive) throws IOException {
         String key = getSubscriptionKey(info.getClientId(), info.getSubscriptionName());
+        lock.lock();
+        try {
             // if already exists - won't add it again as it causes data files
             // to hang around
             if (!subscriberContainer.containsKey(key)) {
@@ -207,14 +224,22 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
                  * ref.setMessageEntry(tsa.getMessageEntry()); container.add(ref); }
                  */
             }
+        }finally {
+            lock.unlock();
+        }
     }
 
-    public synchronized void deleteSubscription(String clientId, String subscriptionName) throws IOException {
+    public void deleteSubscription(String clientId, String subscriptionName) throws IOException {
+        lock.lock();
+        try {
             SubscriptionInfo info = lookupSubscription(clientId, subscriptionName);
             if (info != null) {
                 adapter.removeSubscriberState(info);
             }
         removeSubscriberMessageContainer(clientId,subscriptionName);
+        }finally {
+            lock.unlock();
+        }
     }
 
     public SubscriptionInfo[] getAllSubscriptions() throws IOException {
@@ -233,9 +258,11 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
         return subscriberContainer.get(getSubscriptionKey(clientId, subscriptionName));
     }
 
-    public synchronized void recoverNextMessages(String clientId, String subscriptionName, int maxReturned,
+    public void recoverNextMessages(String clientId, String subscriptionName, int maxReturned,
                                                  MessageRecoveryListener listener) throws Exception {
         String key = getSubscriptionKey(clientId, subscriptionName);
+        lock.lock();
+        try {
             TopicSubContainer container = subscriberMessages.get(key);
             if (container != null) {
                 int count = 0;
@@ -269,6 +296,9 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
                     } while (entry != null && count < maxReturned && listener.hasSpace());
                 }
             }
+        }finally {
+            lock.unlock();
+        }
     }
 
     public void recoverSubscription(String clientId, String subscriptionName, MessageRecoveryListener listener)
@@ -288,12 +318,17 @@ public class KahaTopicReferenceStore extends KahaReferenceStore implements Topic
         }
     }
 
-    public synchronized void resetBatching(String clientId, String subscriptionName) {
+    public void resetBatching(String clientId, String subscriptionName) {
+        lock.lock();
+        try {
             String key = getSubscriptionKey(clientId, subscriptionName);
             TopicSubContainer topicSubContainer = subscriberMessages.get(key);
             if (topicSubContainer != null) {
                 topicSubContainer.reset();
             }
+        }finally {
+            lock.unlock();
+        }
     }
 
     protected void removeSubscriberMessageContainer(String clientId, String subscriptionName) throws IOException {

activemq-core/src/main/java/org/apache/activemq/store/memory/MemoryTopicMessageStore.java

@@ -124,7 +124,7 @@ public class MemoryTopicMessageStore extends MemoryMessageStore implements Topic
     }
 
     public void recoverNextMessages(String clientId, String subscriptionName, int maxReturned, MessageRecoveryListener listener) throws Exception {
-        MemoryTopicSub sub = topicSubMap.get(new SubscriptionKey(clientId, subscriptionName));
+        MemoryTopicSub sub = this.topicSubMap.get(new SubscriptionKey(clientId, subscriptionName));
         if (sub != null) {
             sub.recoverNextMessages(maxReturned, listener);
         }