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

resolve https://issues.apache.org/activemq/browse/AMQ-2584 for kahaDB, AMQ store still needs work, seems to be a different issue 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@986651 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2010-08-18 13:04:25 +00:00
parent e7503f147f
commit 815c2f32bc
2 changed files with 211 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
View File

@ -998,6 +998,7 @@ public class MessageDatabase extends ServiceSupport implements BrokerServiceAwar
LOG.warn("Duplicate message add attempt rejected. Message id: " + command.getMessageId());
// TODO: consider just rolling back the tx.
sd.messageIdIndex.put(tx, command.getMessageId(), previous);
sd.locationIndex.remove(tx, location);
}
} else {
// restore the previous value.. Looks like this was a redo of a

210
activemq-core/src/test/java/org/apache/activemq/bugs/AMQ2584Test.java Normal file
View File

@ -0,0 +1,210 @@
/**
* 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.bugs;
import java.util.Properties;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageConsumer;
import javax.jms.MessageListener;
import javax.jms.MessageProducer;
import javax.jms.Session;
import junit.framework.Test;
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.jmx.BrokerView;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
import org.apache.activemq.store.PersistenceAdapter;
import org.apache.activemq.util.IntrospectionSupport;
import org.apache.activemq.util.Wait;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
public class AMQ2584Test extends org.apache.activemq.TestSupport {
static final Log LOG = LogFactory.getLog(AMQ2584Test.class);
BrokerService broker = null;
ActiveMQTopic topic;
ActiveMQConnection consumerConnection = null, producerConnection = null;
Session producerSession;
MessageProducer producer;
final int minPercentUsageForStore = 10;
String data;
public static Test suite() {
return suite(AMQ2584Test.class);
}
public void initCombosForTestSize() throws Exception {
this.addCombinationValues("defaultPersistenceAdapter",
new Object[]{
// PersistenceAdapterChoice.AMQ,
PersistenceAdapterChoice.KahaDB
});
}
public void testSize() throws Exception {
CountDownLatch redeliveryConsumerLatch = new CountDownLatch(15000 -1);
openConsumer(redeliveryConsumerLatch);
assertEquals(0, broker.getAdminView().getStorePercentUsage());
for (int i = 0; i < 5000; i++) {
sendMessage(false);
}
final BrokerView brokerView = broker.getAdminView();
broker.getSystemUsage().getStoreUsage().isFull();
LOG.info("store percent usage: "+brokerView.getStorePercentUsage());
assertTrue("some store in use", broker.getAdminView().getStorePercentUsage() > minPercentUsageForStore);
assertTrue("redelivery consumer got all it needs", redeliveryConsumerLatch.await(60, TimeUnit.SECONDS));
closeConsumer();
// consume from DLQ
final CountDownLatch received = new CountDownLatch(5000 -1);
consumerConnection = (ActiveMQConnection) createConnection();
Session dlqSession = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageConsumer dlqConsumer = dlqSession.createConsumer(new ActiveMQQueue("ActiveMQ.DLQ"));
dlqConsumer.setMessageListener(new MessageListener() {
public void onMessage(Message message) {
if (received.getCount() % 500 == 0) {
LOG.info("remaining on DLQ: " + received.getCount());
}
received.countDown();
}
});
consumerConnection.start();
assertTrue("Not all messages reached the DLQ", received.await(60, TimeUnit.SECONDS));
assertTrue("Store usage exceeds expected usage",
Wait.waitFor(new Wait.Condition() {
public boolean isSatisified() throws Exception {
broker.getSystemUsage().getStoreUsage().isFull();
LOG.info("store precent usage: "+brokerView.getStorePercentUsage());
return broker.getAdminView().getStorePercentUsage() < minPercentUsageForStore;
}
}));
closeConsumer();
}
private void openConsumer(final CountDownLatch latch) throws Exception {
consumerConnection = (ActiveMQConnection) createConnection();
consumerConnection.setClientID("cliID");
consumerConnection.start();
final Session session = consumerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
MessageListener listener = new MessageListener() {
public void onMessage(Message message) {
latch.countDown();
try {
session.recover();
} catch (Exception ignored) {
ignored.printStackTrace();
}
}
};
session.createDurableSubscriber(topic, "subName1").setMessageListener(listener);
session.createDurableSubscriber(topic, "subName2").setMessageListener(listener);
session.createDurableSubscriber(topic, "subName3").setMessageListener(listener);
}
private void closeConsumer() throws JMSException {
if (consumerConnection != null)
consumerConnection.close();
consumerConnection = null;
}
private void sendMessage(boolean filter) throws Exception {
if (producerConnection == null) {
producerConnection = (ActiveMQConnection) createConnection();
producerConnection.start();
producerSession = producerConnection.createSession(false, Session.AUTO_ACKNOWLEDGE);
producer = producerSession.createProducer(topic);
}
Message message = producerSession.createMessage();
message.setStringProperty("data", data);
producer.send(message);
}
private void startBroker(boolean deleteMessages) throws Exception {
broker = new BrokerService();
broker.setAdvisorySupport(false);
broker.setBrokerName("testStoreSize");
if (deleteMessages) {
broker.setDeleteAllMessagesOnStartup(true);
}
setDefaultPersistenceAdapter(broker);
configurePersistenceAdapter(broker.getPersistenceAdapter());
broker.getSystemUsage().getStoreUsage().setLimit(200 * 1000 * 1000);
broker.start();
}
private void configurePersistenceAdapter(PersistenceAdapter persistenceAdapter) {
Properties properties = new Properties();
String maxFileLengthVal = String.valueOf(1 * 1024 * 1024);
properties.put("journalMaxFileLength", maxFileLengthVal);
properties.put("maxFileLength", maxFileLengthVal);
properties.put("cleanupInterval", "2000");
properties.put("checkpointInterval", "2000");
IntrospectionSupport.setProperties(persistenceAdapter, properties);
}
private void stopBroker() throws Exception {
if (broker != null)
broker.stop();
broker = null;
}
protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
return new ActiveMQConnectionFactory("vm://testStoreSize?jms.watchTopicAdvisories=false&jms.redeliveryPolicy.maximumRedeliveries=0&waitForStart=5000&create=false");
}
@Override
protected void setUp() throws Exception {
super.setUp();
StringBuilder sb = new StringBuilder(5000);
for (int i = 0; i < 5000; i++) {
sb.append('a');
}
data = sb.toString();
startBroker(true);
topic = (ActiveMQTopic) createDestination();
}
@Override
protected void tearDown() throws Exception {
stopBroker();
super.tearDown();
}
}