You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2012/10/05 21:05:00 UTC
svn commit: r1394733 - in /activemq/trunk:
activemq-core/src/test/java/org/apache/activemq/usecases/
kahadb/src/main/java/org/apache/kahadb/index/
kahadb/src/main/java/org/apache/kahadb/page/
Author: gtully
Date: Fri Oct 5 19:04:59 2012
New Revision: 1394733
URL: http://svn.apache.org/viewvc?rev=1394733&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-4094 - offline durable subs with selectors can lead to page leaks in the index and bloat of db.data in kahadb - fix up page caching on overflow and btree free on remove. test that validates the inuse page count for specific intervals
Added:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java (with props)
Modified:
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java
activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java?rev=1394733&view=auto
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java (added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java Fri Oct 5 19:04:59 2012
@@ -0,0 +1,223 @@
+/**
+ * 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.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import javax.jms.Connection;
+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.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.store.kahadb.KahaDBPersistenceAdapter;
+import org.apache.activemq.store.kahadb.KahaDBStore;
+import org.apache.activemq.util.Wait;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DurableSubsOfflineSelectorIndexUseTest extends org.apache.activemq.TestSupport {
+
+ private static final Logger LOG = LoggerFactory.getLogger(DurableSubsOfflineSelectorIndexUseTest.class);
+ public int messageCount = 400;
+ private BrokerService broker;
+ private ActiveMQTopic topic;
+ private List<Throwable> exceptions = new ArrayList<Throwable>();
+
+ protected ActiveMQConnectionFactory createConnectionFactory() throws Exception {
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory("vm://" + getName(true));
+ connectionFactory.setWatchTopicAdvisories(false);
+ return connectionFactory;
+ }
+
+ @Override
+ protected Connection createConnection() throws Exception {
+ return createConnection("id");
+ }
+
+ protected Connection createConnection(String name) throws Exception {
+ Connection con = super.createConnection();
+ con.setClientID(name);
+ con.start();
+ return con;
+ }
+
+ public static Test suite() {
+ return suite(DurableSubsOfflineSelectorIndexUseTest.class);
+ }
+
+ protected void setUp() throws Exception {
+ exceptions.clear();
+ topic = (ActiveMQTopic) createDestination();
+ createBroker();
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ destroyBroker();
+ }
+
+ private void createBroker() throws Exception {
+ createBroker(true);
+ }
+
+ private void createBroker(boolean deleteAllMessages) throws Exception {
+ broker = BrokerFactory.createBroker("broker:(vm://" + getName(true) + ")");
+ broker.setBrokerName(getName(true));
+ broker.setDeleteAllMessagesOnStartup(deleteAllMessages);
+ broker.getManagementContext().setCreateConnector(false);
+ broker.setAdvisorySupport(false);
+ broker.addConnector("tcp://0.0.0.0:0");
+
+ setDefaultPersistenceAdapter(broker);
+ broker.start();
+ }
+
+ private void destroyBroker() throws Exception {
+ if (broker != null)
+ broker.stop();
+ }
+
+ public void initCombosForTestIndexPageUsage() {
+ addCombinationValues("messageCount", new Integer[]{890, 900, 400});
+ }
+
+ public void testIndexPageUsage() throws Exception {
+ Connection con = createConnection();
+ Session session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ session.createDurableSubscriber(topic, "true", "filter = 'true'", true);
+ session.close();
+
+ session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ session.createDurableSubscriber(topic, "false", "filter = 'false'", true);
+ session.close();
+
+ con.close();
+
+ // send messages
+ final Connection sendCon = createConnection("send");
+ final Session sendSession = sendCon.createSession(false, Session.AUTO_ACKNOWLEDGE);
+ final MessageProducer producer = sendSession.createProducer(null);
+
+ Thread sendThread = new Thread() {
+ public void run() {
+ try {
+
+ for (int i = 0; i < messageCount; i++) {
+ boolean filter = i % 2 == 1;
+ Message message = sendSession.createMessage();
+ message.setStringProperty("filter", filter ? "true" : "false");
+ producer.send(topic, message);
+
+ if (i > 0 && i % 1000 == 0) {
+ LOG.info("Sent:" + i);
+ }
+ }
+ sendSession.close();
+ sendCon.close();
+ } catch (Exception e) {
+ exceptions.add(e);
+ }
+ }
+ };
+ sendThread.start();
+
+ sendThread.join();
+
+ // settle with sent messages
+ TimeUnit.SECONDS.sleep(4);
+
+ // consume messages
+ con = createConnection();
+ session = con.createSession(false, Session.AUTO_ACKNOWLEDGE);
+
+ MessageConsumer consumerTrue = session.createDurableSubscriber(topic, "true", "filter = 'true'", true);
+ Listener listenerT = new Listener();
+ consumerTrue.setMessageListener(listenerT);
+
+ waitFor(listenerT, messageCount / 2);
+
+ MessageConsumer consumerFalse = session.createDurableSubscriber(topic, "false", "filter = 'false'", true);
+ Listener listenerF = new Listener();
+ consumerFalse.setMessageListener(listenerF);
+
+ waitFor(listenerF, messageCount / 2);
+
+ assertEquals(messageCount / 2, listenerT.count);
+ assertEquals(messageCount / 2, listenerF.count);
+
+ session.close();
+ con.close();
+
+ final KahaDBStore store = ((KahaDBPersistenceAdapter) broker.getPersistenceAdapter()).getStore();
+ LOG.info("Store page count: " + store.getPageFile().getPageCount());
+ LOG.info("Store free page count: " + store.getPageFile().getFreePageCount());
+ LOG.info("Store page in-use: " + (store.getPageFile().getPageCount() - store.getPageFile().getFreePageCount()));
+
+ assertTrue("no leak of pages, always use just 10", Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return 10 == store.getPageFile().getPageCount() -
+ store.getPageFile().getFreePageCount();
+ }
+ }, TimeUnit.SECONDS.toMillis(10)));
+ }
+
+ private void waitFor(final Listener listener, final int count) throws Exception {
+
+ assertTrue("got all messages on time", Wait.waitFor(new Wait.Condition() {
+ @Override
+ public boolean isSatisified() throws Exception {
+ return listener.count == count;
+ }
+ }, TimeUnit.MINUTES.toMillis(10)));
+
+ }
+
+ private void dumpstats() throws Exception {
+ //TimeUnit.SECONDS.sleep(2);
+ //ThreadTracker.result();
+ TimeUnit.SECONDS.sleep(4);
+
+
+ }
+
+ public static class Listener implements MessageListener {
+ int count = 0;
+ String id = null;
+
+ Listener() {
+ }
+
+ public void onMessage(Message message) {
+ count++;
+ if (id != null) {
+ try {
+ LOG.info(id + ", " + message.getJMSMessageID());
+ } catch (Exception ignored) {
+ }
+ }
+ }
+ }
+}
Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubsOfflineSelectorIndexUseTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java?rev=1394733&r1=1394732&r2=1394733&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/BTreeNode.java Fri Oct 5 19:04:59 2012
@@ -332,10 +332,9 @@ public final class BTreeNode<Key,Value>
keys = child.keys;
children = child.children;
values = child.values;
- // free up the page..
- tx.free(child.getPage());
}
-
+ // free up the page..
+ tx.free(child.getPage());
}
index.storeNode(tx, this, true);
}
Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java?rev=1394733&r1=1394732&r2=1394733&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/index/ListNode.java Fri Oct 5 19:04:59 2012
@@ -309,15 +309,7 @@ public final class ListNode<Key, Value>
}
public void storeUpdate(Transaction tx) throws IOException {
- try {
- if (this.entries.size() == 1) {
- getContainingList().storeNode(tx, this, true);
- } else {
- getContainingList().storeNode(tx, this, false);
- }
- } catch (Transaction.PageOverflowIOException e) {
- split(tx, ADD_FIRST);
- }
+ getContainingList().storeNode(tx, this, true);
}
private void store(Transaction tx, boolean addFirst) throws IOException {
@@ -342,11 +334,7 @@ public final class ListNode<Key, Value>
}
private void store(Transaction tx) throws IOException {
- if (this.entries.size() == 1) {
- getContainingList().storeNode(tx, this, true);
- } else {
- getContainingList().storeNode(tx, this, false);
- }
+ getContainingList().storeNode(tx, this, true);
}
private void split(Transaction tx, boolean isAddFirst) throws IOException {
Modified: activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java
URL: http://svn.apache.org/viewvc/activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java?rev=1394733&r1=1394732&r2=1394733&view=diff
==============================================================================
--- activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java (original)
+++ activemq/trunk/kahadb/src/main/java/org/apache/kahadb/page/Transaction.java Fri Oct 5 19:04:59 2012
@@ -307,6 +307,9 @@ public class Transaction implements Iter
System.arraycopy(buf, 0, data, 0, pageSize);
Transaction.this.write(current, data);
+ // make the new link visible
+ pageFile.addToCache(current);
+
// Reset for the next page chunk
pos = 0;
// The page header marshalled after the data is written.