https://issues.apache.org/jira/browse/AMQ-6199 - apply CursorMemoryHighWaterMark to topic subscriptions

activemq-broker/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java

@@ -682,6 +682,7 @@ public class AdvisoryBroker extends BrokerFilter {
                 ActiveMQTopic topic = AdvisorySupport.getFullAdvisoryTopic(destination.getActiveMQDestination());
                 ActiveMQMessage advisoryMessage = new ActiveMQMessage();
                 advisoryMessage.setStringProperty(AdvisorySupport.MSG_PROPERTY_USAGE_NAME, usage.getName());
+                advisoryMessage.setLongProperty(AdvisorySupport.MSG_PROPERTY_USAGE_COUNT, usage.getUsage());
                 fireAdvisory(context, topic, null, null, advisoryMessage);
 
             } catch (Exception e) {

activemq-broker/src/main/java/org/apache/activemq/broker/region/policy/PolicyEntry.java

@@ -313,6 +313,7 @@ public class PolicyEntry extends DestinationMapEntry {
 
     public void configure(Broker broker, SystemUsage memoryManager, TopicSubscription subscription) {
         configurePrefetch(subscription);
+        subscription.setCursorMemoryHighWaterMark(getCursorMemoryHighWaterMark());
         if (pendingMessageLimitStrategy != null) {
             int value = pendingMessageLimitStrategy.getMaximumPendingMessageLimit(subscription);
             int consumerLimit = subscription.getInfo().getMaximumPendingMessageLimit();

activemq-client/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java

@@ -62,6 +62,8 @@ public final class AdvisorySupport {
     public static final String MSG_PROPERTY_ORIGIN_BROKER_NAME = "originBrokerName";
     public static final String MSG_PROPERTY_ORIGIN_BROKER_URL = "originBrokerURL";
     public static final String MSG_PROPERTY_USAGE_NAME = "usageName";
+    public static final String MSG_PROPERTY_USAGE_COUNT = "usageCount";
+
     public static final String MSG_PROPERTY_CONSUMER_ID = "consumerId";
     public static final String MSG_PROPERTY_PRODUCER_ID = "producerId";
     public static final String MSG_PROPERTY_MESSAGE_ID = "orignalMessageId";

activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerFlowControlTest.java

@@ -71,15 +71,8 @@ public class TopicProducerFlowControlTest extends TestCase implements MessageLis
         tpe.setProducerFlowControl(true);
         tpe.setAdvisoryWhenFull(true);
 
-        // Setup the topic destination policy
-        PolicyEntry qpe = new PolicyEntry();
-        qpe.setQueue(">");
-        qpe.setMemoryLimit(destinationMemLimit);
-        qpe.setProducerFlowControl(true);
-        qpe.setQueuePrefetch(1);
-        qpe.setAdvisoryWhenFull(true);
 
-        pm.setPolicyEntries(Arrays.asList(new PolicyEntry[]{tpe, qpe}));
+        pm.setPolicyEntries(Arrays.asList(new PolicyEntry[]{tpe}));
 
         setDestinationPolicy(broker, pm);
 
@@ -118,8 +111,20 @@ public class TopicProducerFlowControlTest extends TestCase implements MessageLis
         listenerSession.createConsumer(new ActiveMQTopic(AdvisorySupport.FULL_TOPIC_PREFIX + ">")).setMessageListener(new MessageListener() {
             @Override
             public void onMessage(Message message) {
-                LOG.info("Got full advisory, blockedCounter: " + blockedCounter.get());
+                try {
-                blockedCounter.incrementAndGet();
+                    if (blockedCounter.get() % 100 == 0) {
+                        LOG.info("Got full advisory, usageName: " +
+                                message.getStringProperty(AdvisorySupport.MSG_PROPERTY_USAGE_NAME) +
+                                ", usageCount: " +
+                                message.getLongProperty(AdvisorySupport.MSG_PROPERTY_USAGE_COUNT)
+                                + ", blockedCounter: " + blockedCounter.get());
+                    }
+                    blockedCounter.incrementAndGet();
+
+                } catch (Exception error) {
+                    error.printStackTrace();
+                    LOG.error("missing advisory property", error);
+                }
             }
         });
 

activemq-unit-tests/src/test/java/org/apache/activemq/usecases/TopicProducerToSubFileCursorTest.java

@@ -0,0 +1,194 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.usecases;
+
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.jms.Connection;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.Session;
+import junit.framework.TestCase;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQPrefetchPolicy;
+import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.region.policy.PolicyEntry;
+import org.apache.activemq.broker.region.policy.PolicyMap;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.util.Wait;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TopicProducerToSubFileCursorTest extends TestCase implements MessageListener {
+    private static final Logger LOG = LoggerFactory.getLogger(TopicProducerToSubFileCursorTest.class);
+    private static final String brokerName = "testBroker";
+    private static final String brokerUrl = "vm://" + brokerName;
+    protected static final int destinationMemLimit = 2097152; // 2MB
+    private static final AtomicLong produced = new AtomicLong();
+    private static final AtomicLong consumed = new AtomicLong();
+    private static final int numMessagesToSend = 20000;
+
+    private BrokerService broker;
+
+    protected void setUp() throws Exception {
+        // Setup and start the broker
+        broker = new BrokerService();
+        broker.setBrokerName(brokerName);
+        broker.setPersistent(true);
+        broker.setDeleteAllMessagesOnStartup(true);
+        broker.setSchedulerSupport(false);
+        broker.setUseJmx(false);
+        broker.setUseShutdownHook(false);
+        broker.addConnector(brokerUrl);
+
+        // Setup the destination policy
+        PolicyMap pm = new PolicyMap();
+
+        // Setup the topic destination policy
+        PolicyEntry tpe = new PolicyEntry();
+        tpe.setTopic(">");
+        tpe.setMemoryLimit(destinationMemLimit);
+        tpe.setCursorMemoryHighWaterMark(2); // 2% of global usage will match destMemLimit
+        tpe.setProducerFlowControl(true);
+        tpe.setAdvisoryWhenFull(true);
+
+
+        pm.setPolicyEntries(Arrays.asList(new PolicyEntry[]{tpe}));
+
+        setDestinationPolicy(broker, pm);
+
+        broker.getSystemUsage().getMemoryUsage().setLimit(100*1024*1024);
+
+        // Start the broker
+        broker.start();
+        broker.waitUntilStarted();
+    }
+
+    protected void setDestinationPolicy(BrokerService broker, PolicyMap pm) {
+        broker.setDestinationPolicy(pm);
+    }
+
+    protected void tearDown() throws Exception {
+        broker.stop();
+        broker.waitUntilStopped();
+    }
+
+    public void testTopicProducerFlowControlNotUsedWhenSubSpoolsToDiskOnTwoPercentSystemUsage() throws Exception {
+
+        // Create the connection factory
+        ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(brokerUrl);
+        connectionFactory.setAlwaysSyncSend(true);
+        connectionFactory.setProducerWindowSize(1024);
+
+        ActiveMQPrefetchPolicy prefetchPolicy = new ActiveMQPrefetchPolicy();
+        prefetchPolicy.setAll(5000);
+        connectionFactory.setPrefetchPolicy(prefetchPolicy);
+        // Start the test destination listener
+        Connection c = connectionFactory.createConnection();
+        c.start();
+        Session listenerSession = c.createSession(false, 1);
+        Destination destination = createDestination(listenerSession);
+
+        listenerSession.createConsumer(destination).setMessageListener(new TopicProducerToSubFileCursorTest());
+        final AtomicInteger blockedCounter = new AtomicInteger(0);
+        listenerSession.createConsumer(new ActiveMQTopic(AdvisorySupport.FULL_TOPIC_PREFIX + ">")).setMessageListener(new MessageListener() {
+            @Override
+            public void onMessage(Message message) {
+                try {
+                    LOG.error("Got full advisory, usageName: " +
+                            message.getStringProperty(AdvisorySupport.MSG_PROPERTY_USAGE_NAME) +
+                            ", usageCount: " +
+                            message.getLongProperty(AdvisorySupport.MSG_PROPERTY_USAGE_COUNT)
+                            + ", blockedCounter: " + blockedCounter.get());
+
+                    blockedCounter.incrementAndGet();
+
+                } catch (Exception error) {
+                    error.printStackTrace();
+                    LOG.error("missing advisory property", error);
+                }
+            }
+        });
+
+        // Start producing the test messages
+        final Session session = connectionFactory.createConnection().createSession(false, Session.AUTO_ACKNOWLEDGE);
+        final MessageProducer producer = session.createProducer(destination);
+
+        Thread producingThread = new Thread("Producing Thread") {
+            public void run() {
+                try {
+                    for (long i = 0; i < numMessagesToSend; i++) {
+                        producer.send(session.createTextMessage("test"));
+
+                        long count = produced.incrementAndGet();
+                        if (count % 10000 == 0) {
+                            LOG.info("Produced " + count + " messages");
+                        }
+                    }
+                } catch (Throwable ex) {
+                    ex.printStackTrace();
+                } finally {
+                    try {
+                        producer.close();
+                        session.close();
+                    } catch (Exception e) {
+                    }
+                }
+            }
+        };
+
+        producingThread.start();
+
+        Wait.waitFor(new Wait.Condition() {
+            public boolean isSatisified() throws Exception {
+                return consumed.get() == numMessagesToSend;
+            }
+        }, 5 * 60 * 1000); // give it plenty of time before failing
+
+        assertEquals("Didn't produce all messages", numMessagesToSend, produced.get());
+        assertEquals("Didn't consume all messages", numMessagesToSend, consumed.get());
+
+         assertTrue("Producer did not get blocked", Wait.waitFor(new Wait.Condition() {
+             public boolean isSatisified() throws Exception {
+                 return blockedCounter.get() == 0;
+             }
+         }, 5 * 1000));
+    }
+
+    protected Destination createDestination(Session listenerSession) throws Exception {
+        return new ActiveMQTopic("test");
+    }
+
+    @Override
+    public void onMessage(Message message) {
+        long count = consumed.incrementAndGet();
+        if (count % 100 == 0) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+            }
+        }
+        if (count % 10000 == 0) {
+            LOG.info("\tConsumed " + count + " messages");
+        }
+
+    }
+}