JBoss hornetq SVN: r9296 - trunk.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-06-03 13:50:48 -0400 (Thu, 03 Jun 2010)
New Revision: 9296
Modified:
trunk/build-hornetq.properties
Log:
Giving more time for stress test
Modified: trunk/build-hornetq.properties
===================================================================
--- trunk/build-hornetq.properties 2010-06-03 17:43:50 UTC (rev 9295)
+++ trunk/build-hornetq.properties 2010-06-03 17:50:48 UTC (rev 9296)
@@ -30,4 +30,4 @@
# 90 mins
clustering.stress.junit.timeout=5400000
# 90 mins
-stress.junit.timeout=5400000
+stress.junit.timeout=7400000
13 years, 11 months
JBoss hornetq SVN: r9295 - trunk/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-06-03 13:43:50 -0400 (Thu, 03 Jun 2010)
New Revision: 9295
Modified:
trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
Log:
removing log.info
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-06-03 14:51:13 UTC (rev 9294)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-06-03 17:43:50 UTC (rev 9295)
@@ -378,7 +378,6 @@
{
//We don't decrement delivery count if the client failed, since there's a possibility that refs were actually delivered but we just didn't get any acks for them
//before failure
- log.info("decrementing delivery count");
ref.decrementDeliveryCount();
}
13 years, 11 months
JBoss hornetq SVN: r9294 - tags.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-03 10:51:13 -0400 (Thu, 03 Jun 2010)
New Revision: 9294
Added:
tags/Hornetq_2_1_0_Final_pending/
Log:
created pending tag for hornetq 2.1.0.Final
Copied: tags/Hornetq_2_1_0_Final_pending (from rev 9293, trunk)
13 years, 11 months
JBoss hornetq SVN: r9293 - trunk/docs.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-03 10:49:20 -0400 (Thu, 03 Jun 2010)
New Revision: 9293
Modified:
trunk/docs/README.html
Log:
updated read me
Modified: trunk/docs/README.html
===================================================================
--- trunk/docs/README.html 2010-06-03 14:36:41 UTC (rev 9292)
+++ trunk/docs/README.html 2010-06-03 14:49:20 UTC (rev 9293)
@@ -3,22 +3,22 @@
<head>
<meta content="text/html; charset=ISO-8859-1"
http-equiv="content-type">
- <title>HornetQ 2.1.0 CR1 Release Notes</title>
+ <title>HornetQ 2.1.0 Final Release Notes</title>
</head>
<body>
-<h1>Release Notes - HornetQ - Version 2.1.0 CR1</h1>
+<h1>Release Notes - HornetQ - Version 2.1.0 Final</h1>
<br>
<h2>28th May 2010</h2>
-These are the release notes for HornetQ 2.1.0 CR1<br><br>
+These are the release notes for HornetQ 2.1.0 Final<br><br>
For full description of the contents please see the
-<a href="https://jira.jboss.org/secure/ReleaseNote.jspa?projectId=12310830&version...">HornetQ project JIRA</a>.<br><br>
+<a href="https://jira.jboss.org/secure/ReleaseNote.jspa?projectId=12310830&version...">HornetQ project JIRA</a>.<br><br>
-This release is a feature complete release for forthcoming HornetQ 2.1.0<br>
+This release is a feature complete release for HornetQ 2.1.0<br>
<br>
13 years, 11 months
JBoss hornetq SVN: r9292 - in trunk: src/config/common and 1 other directory.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-03 10:36:41 -0400 (Thu, 03 Jun 2010)
New Revision: 9292
Modified:
trunk/build-maven.xml
trunk/pom.xml
trunk/src/config/common/hornetq-version.properties
Log:
updated version numbers
Modified: trunk/build-maven.xml
===================================================================
--- trunk/build-maven.xml 2010-06-03 14:19:26 UTC (rev 9291)
+++ trunk/build-maven.xml 2010-06-03 14:36:41 UTC (rev 9292)
@@ -13,7 +13,7 @@
-->
<project default="upload" name="HornetQ">
- <property name="hornetq.version" value="2.1.0.CR1"/>
+ <property name="hornetq.version" value="2.1.0.Final"/>
<property name="build.dir" value="build"/>
<property name="jars.dir" value="${build.dir}/jars"/>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-06-03 14:19:26 UTC (rev 9291)
+++ trunk/pom.xml 2010-06-03 14:36:41 UTC (rev 9292)
@@ -19,7 +19,7 @@
<groupId>org.hornetq</groupId>
<artifactId>messaging</artifactId>
<packaging>pom</packaging>
- <version>2.0.0.CR1</version>
+ <version>2.1.0.Final</version>
<name>HornetQ</name>
<url>http://hornetq.org</url>
@@ -222,7 +222,7 @@
<dependency>
<groupId>org.jboss.netty</groupId>
<artifactId>netty</artifactId>
- <version>3.2.0.CR1</version>
+ <version>3.2.0.Final</version>
</dependency>
<!--needed to compile the logging jar-->
<dependency>
Modified: trunk/src/config/common/hornetq-version.properties
===================================================================
--- trunk/src/config/common/hornetq-version.properties 2010-06-03 14:19:26 UTC (rev 9291)
+++ trunk/src/config/common/hornetq-version.properties 2010-06-03 14:36:41 UTC (rev 9292)
@@ -1,8 +1,8 @@
-hornetq.version.versionName=auraria
+hornetq.version.versionName=marimbondo
hornetq.version.majorVersion=2
hornetq.version.minorVersion=1
hornetq.version.microVersion=0
hornetq.version.incrementingVersion=118
-hornetq.version.versionSuffix=CR1
-hornetq.version.versionTag=CR1
+hornetq.version.versionSuffix=Final
+hornetq.version.versionTag=Final
hornetq.netty.version=(a)NETTY.VERSION@
13 years, 11 months
JBoss hornetq SVN: r9291 - trunk/docs/user-manual/en.
by do-not-reply＠jboss.org
Author: ataylor
Date: 2010-06-03 10:19:26 -0400 (Thu, 03 Jun 2010)
New Revision: 9291
Modified:
trunk/docs/user-manual/en/appserver-integration.xml
Log:
added pooling section for Resource Adaptor
Modified: trunk/docs/user-manual/en/appserver-integration.xml
===================================================================
--- trunk/docs/user-manual/en/appserver-integration.xml 2010-06-03 14:03:57 UTC (rev 9290)
+++ trunk/docs/user-manual/en/appserver-integration.xml 2010-06-03 14:19:26 UTC (rev 9291)
@@ -283,6 +283,29 @@
EJBs (including Session, Entity and Message-Driven Beans), Servlets (including jsps) and
custom MBeans.</para>
</section>
+ <section>
+ <title>MDB and Consumer pool size</title>
+ <para>Most application servers, including JBoss, allow you to configure how many MDB's there are in a pool. In
+ Jboss this is configured via the <literal>MaxPoolSize</literal> parameter in the ejb3-interceptors-aop.xml file. Configuring
+ this has no actual effect on how many sessions/consumers there actually are created. This is because the Resource
+ Adaptor implementation knows nothing about the application servers MDB implementation. So even if you set the MDB
+ pool size to 1, 15 sessions/consumers will be created (this is the default). If you want to limit how many
+ sessions/consumers are created then you need to set the <literal>maxSession</literal> parameter either on the
+ resource adapter itself or via an an Activation Config Property on the MDB itself</para>
+ <programlisting>@MessageDriven(name = "MDBMessageSendTxExample",
+ activationConfig =
+ {
+ @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
+ @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue"),
+ @ActivationConfigProperty(propertyName = "maxSession", propertyValue = "1")
+ })
+@TransactionManagement(value= TransactionManagementType.CONTAINER)
+@TransactionAttribute(value= TransactionAttributeType.REQUIRED)
+@ResourceAdapter("hornetq-ra.rar")
+public class MyMDB implements MessageListener
+{ ....}
+ </programlisting>
+ </section>
<section>
<title>Configuring the JCA Adaptor</title>
<para>The Java Connector Architecture (JCA) Adapter is what allows HornetQ to be integrated
13 years, 11 months
JBoss hornetq SVN: r9290 - trunk/tests/src/org/hornetq/tests/integration/journal.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-06-03 10:03:57 -0400 (Thu, 03 Jun 2010)
New Revision: 9290
Modified:
trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
Log:
just formatting
Modified: trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-06-03 06:04:22 UTC (rev 9289)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-06-03 14:03:57 UTC (rev 9290)
@@ -766,26 +766,26 @@
file.mkdir();
}
-
+
protected void tearDown() throws Exception
{
-
+
File testDir = new File(getTestDir());
-
+
File files[] = testDir.listFiles(new FilenameFilter()
{
-
+
public boolean accept(File dir, String name)
{
return name.startsWith(filePrefix) && name.endsWith(fileExtension);
}
});
-
+
for (File file : files)
{
- assertEquals("File " + file + " doesn't have the expected number of bytes", fileSize, file.length());
+ assertEquals("File " + file + " doesn't have the expected number of bytes", fileSize, file.length());
}
-
+
super.tearDown();
}
13 years, 11 months
JBoss hornetq SVN: r9289 - trunk/tests/src/org/hornetq/tests/integration/journal.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-06-03 02:04:22 -0400 (Thu, 03 Jun 2010)
New Revision: 9289
Modified:
trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
Log:
tweak
Modified: trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-06-03 06:00:01 UTC (rev 9288)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-06-03 06:04:22 UTC (rev 9289)
@@ -784,8 +784,6 @@
for (File file : files)
{
assertEquals("File " + file + " doesn't have the expected number of bytes", fileSize, file.length());
-
- System.out.println("File " + file);
}
super.tearDown();
13 years, 11 months
JBoss hornetq SVN: r9288 - in trunk: tests/src/org/hornetq/tests/integration/journal and 1 other directories.
by do-not-reply＠jboss.org
Author: clebert.suconic(a)jboss.com
Date: 2010-06-03 02:00:01 -0400 (Thu, 03 Jun 2010)
New Revision: 9288
Added:
trunk/tests/src/org/hornetq/tests/stress/journal/JournalRestartStressTest.java
Modified:
trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java
trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
Log:
https://jira.jboss.org/browse/HORNETQ-399 - fixing file size and adding tests
Modified: trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2010-06-01 14:55:59 UTC (rev 9287)
+++ trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2010-06-03 06:00:01 UTC (rev 9288)
@@ -181,6 +181,10 @@
{
sequentialFile.position(0);
SimpleWaitIOCallback completion = new SimpleWaitIOCallback();
+
+ // To Fix the size of the file
+ writingChannel.writerIndex(writingChannel.capacity());
+
sequentialFile.writeDirect(writingChannel.toByteBuffer(), true, completion);
completion.waitCompletion();
sequentialFile.close();
Modified: trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-06-01 14:55:59 UTC (rev 9287)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-06-03 06:00:01 UTC (rev 9288)
@@ -14,6 +14,7 @@
package org.hornetq.tests.integration.journal;
import java.io.File;
+import java.io.FilenameFilter;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -204,7 +205,7 @@
performNonTransactionalDelete = false;
}
- setup(50, 60 * 1024, false);
+ setup(2, 60 * 1024, false);
ArrayList<Long> liveIDs = new ArrayList<Long>();
@@ -765,6 +766,30 @@
file.mkdir();
}
+
+ protected void tearDown() throws Exception
+ {
+
+ File testDir = new File(getTestDir());
+
+ File files[] = testDir.listFiles(new FilenameFilter()
+ {
+
+ public boolean accept(File dir, String name)
+ {
+ return name.startsWith(filePrefix) && name.endsWith(fileExtension);
+ }
+ });
+
+ for (File file : files)
+ {
+ assertEquals("File " + file + " doesn't have the expected number of bytes", fileSize, file.length());
+
+ System.out.println("File " + file);
+ }
+
+ super.tearDown();
+ }
/* (non-Javadoc)
* @see org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase#getFileFactory()
Added: trunk/tests/src/org/hornetq/tests/stress/journal/JournalRestartStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/JournalRestartStressTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/JournalRestartStressTest.java 2010-06-03 06:00:01 UTC (rev 9288)
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2010 Red Hat, Inc.
+ * Red Hat 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.hornetq.tests.stress.journal;
+
+import java.util.ArrayList;
+import java.util.Random;
+
+import org.hornetq.api.core.HornetQException;
+import org.hornetq.api.core.client.ClientConsumer;
+import org.hornetq.api.core.client.ClientMessage;
+import org.hornetq.api.core.client.ClientProducer;
+import org.hornetq.api.core.client.ClientSession;
+import org.hornetq.api.core.client.ClientSessionFactory;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.tests.util.RandomUtil;
+import org.hornetq.tests.util.ServiceTestBase;
+
+/**
+ * Simulates the journal being updated, compacted cleared up,
+ * and having multiple restarts,
+ * To make sure the journal would survive at multiple restarts of the server
+ *
+ * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
+ *
+ *
+ */
+public class JournalRestartStressTest extends ServiceTestBase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ public void testLoad() throws Throwable
+ {
+ HornetQServer server2 = createServer(true, false);
+
+ server2.getConfiguration().setJournalFileSize(10 * 1024 * 1024);
+ server2.getConfiguration().setJournalMinFiles(10);
+ server2.getConfiguration().setJournalCompactMinFiles(3);
+ server2.getConfiguration().setJournalCompactPercentage(50);
+
+
+ for (int i = 0 ; i < 10; i++)
+ {
+ server2.start();
+
+ ClientSessionFactory sf = createFactory(false);
+ sf.setMinLargeMessageSize(1024 * 1024);
+ sf.setBlockOnDurableSend(false);
+
+
+ ClientSession session = sf.createSession(true, true);
+
+ try
+ {
+ session.createQueue("slow-queue", "slow-queue");
+ }
+ catch (Exception ignored)
+ {
+ }
+
+ session.start();
+ ClientConsumer consumer = session.createConsumer("slow-queue");
+
+
+ while (true)
+ {
+ System.out.println("Received message from previous");
+ ClientMessage msg = consumer.receiveImmediate();
+ if (msg == null)
+ {
+ break;
+ }
+ msg.acknowledge();
+ }
+
+
+
+ produceMessages(sf, 30000);
+
+ server2.stop();
+ }
+
+ }
+ // Package protected ---------------------------------------------
+
+ /**
+ * @param TIMEOUT
+ * @param NMSGS
+ * @throws HornetQException
+ * @throws InterruptedException
+ * @throws Throwable
+ */
+ private void produceMessages(final ClientSessionFactory sf, final int NMSGS) throws HornetQException,
+ InterruptedException,
+ Throwable
+ {
+
+ final int TIMEOUT = 5000;
+
+ System.out.println("sending " + NMSGS + " messages");
+
+
+ final ClientSession sessionSend = sf.createSession(true, true);
+
+ ClientProducer prod2 = sessionSend.createProducer("slow-queue");
+
+
+ try
+ {
+ sessionSend.createQueue("Queue", "Queue", true);
+ }
+ catch (Exception ignored)
+ {
+ }
+
+ final ClientSession sessionReceive = sf.createSession(true, true);
+ sessionReceive.start();
+
+ final ArrayList<Throwable> errors = new ArrayList<Throwable>();
+
+ Thread tReceive = new Thread()
+ {
+ public void run()
+ {
+ try
+ {
+ ClientConsumer consumer = sessionReceive.createConsumer("Queue");
+
+ for (int i = 0; i < NMSGS; i++)
+ {
+ if (i % 500 == 0)
+ {
+ double percent = (double)i / (double) NMSGS;
+ System.out.println("msgs " + i + " of " + NMSGS + ", " + (int)(percent * 100) + "%");
+ Thread.sleep(100);
+ }
+
+ ClientMessage msg = consumer.receive(TIMEOUT);
+ if (msg == null)
+ {
+ errors.add(new Exception("Didn't receive msgs"));
+ break;
+ }
+ msg.acknowledge();
+ }
+ }
+ catch (Exception e)
+ {
+ errors.add(e);
+ }
+ }
+ };
+
+ tReceive.start();
+
+ ClientProducer prod = sessionSend.createProducer("Queue");
+
+ Random random = new Random();
+
+ for (int i = 0; i < NMSGS; i++)
+ {
+ ClientMessage msg = sessionSend.createMessage(true);
+
+ int size = RandomUtil.randomPositiveInt() % 10024;
+
+ if (size == 0) size = 10 * 1024;
+
+ byte[] buffer = new byte[size];
+
+ random.nextBytes(buffer);
+
+ msg.getBodyBuffer().writeBytes(buffer);
+
+ prod.send(msg);
+
+ if (i % 5000 == 0)
+ {
+ prod2.send(msg);
+ System.out.println("Sending slow message");
+ }
+ }
+
+ tReceive.join();
+
+ sessionReceive.close();
+ sessionSend.close();
+
+ for (Throwable e : errors)
+ {
+ throw e;
+ }
+ }
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
13 years, 11 months