[jboss-cvs] JBoss Messaging SVN: r7299 - in trunk: examples/jms/perf/server0 and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 10 14:12:08 EDT 2009
Author: timfox
Date: 2009-06-10 14:12:08 -0400 (Wed, 10 Jun 2009)
New Revision: 7299
Modified:
trunk/examples/jms/perf/jndi.properties
trunk/examples/jms/perf/perf.properties
trunk/examples/jms/perf/server0/jbm-configuration.xml
trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
Log:
a small fix to queue deployment and tweaks
Modified: trunk/examples/jms/perf/jndi.properties
===================================================================
--- trunk/examples/jms/perf/jndi.properties 2009-06-10 17:00:57 UTC (rev 7298)
+++ trunk/examples/jms/perf/jndi.properties 2009-06-10 18:12:08 UTC (rev 7299)
@@ -1,3 +1,3 @@
java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.provider.url=jnp://localhost:1099
+java.naming.provider.url=jnp://localhost:1199
java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
Modified: trunk/examples/jms/perf/perf.properties
===================================================================
--- trunk/examples/jms/perf/perf.properties 2009-06-10 17:00:57 UTC (rev 7298)
+++ trunk/examples/jms/perf/perf.properties 2009-06-10 18:12:08 UTC (rev 7299)
@@ -1,10 +1,10 @@
-num-messages=100000
-num-warmup-messages=10000
-message-size=0
-durable=false
+num-messages=1
+num-warmup-messages=0
+message-size=1024
+durable=true
transacted=false
batch-size=1000
-drain-queue=true
+drain-queue=false
destination-lookup=perfQueue
connection-factory-lookup=/ConnectionFactory
throttle-rate=-1
Modified: trunk/examples/jms/perf/server0/jbm-configuration.xml
===================================================================
--- trunk/examples/jms/perf/server0/jbm-configuration.xml 2009-06-10 17:00:57 UTC (rev 7298)
+++ trunk/examples/jms/perf/server0/jbm-configuration.xml 2009-06-10 18:12:08 UTC (rev 7299)
@@ -20,10 +20,12 @@
<param key="jbm.remoting.netty.tcpreceivebuffersize" value="1048576" type="Integer"/>
</acceptor>
</acceptors>
+
+ <backup>true</backup>
<security-enabled>false</security-enabled>
- <persistence-enabled>false</persistence-enabled>
+ <persistence-enabled>true</persistence-enabled>
<queues>
<queue name="perfQueue">
Modified: trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-06-10 17:00:57 UTC (rev 7298)
+++ trunk/src/main/org/jboss/messaging/core/persistence/impl/journal/JournalStorageManager.java 2009-06-10 18:12:08 UTC (rev 7299)
@@ -243,14 +243,14 @@
}
public long generateUniqueID()
- {
+ {
long id = idGenerator.generateID();
return id;
}
public long getCurrentUniqueID()
- {
+ {
return idGenerator.getCurrentID();
}
@@ -903,6 +903,7 @@
public void addQueueBinding(final Binding binding) throws Exception
{
Queue queue = (Queue)binding.getBindable();
+
Filter filter = queue.getFilter();
SimpleString filterString = filter == null ? null : filter.getFilterString();
@@ -972,7 +973,7 @@
throw new IllegalStateException("Invalid record type " + rec);
}
}
-
+
idGenerator.setID(lastID + 1);
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-06-10 17:00:57 UTC (rev 7298)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/MessagingServerImpl.java 2009-06-10 18:12:08 UTC (rev 7299)
@@ -588,7 +588,7 @@
{
throw new IllegalArgumentException("node id is null");
}
-
+
synchronized (initialiseLock)
{
if (initialised)
@@ -608,10 +608,8 @@
{
initialised = false;
- throw new IllegalStateException("Live and backup unique ids different. You're probably trying to restart a live backup pair after a crash");
+ throw new IllegalStateException("Live and backup unique ids different (" + liveUniqueID + ":" + backupID + "). You're probably trying to restart a live backup pair after a crash");
}
-
- log.info("Backup server is now operational");
}
}
@@ -771,6 +769,8 @@
{
if (configuration.isBackup())
{
+ log.info("A connection has been made to the backup server so it will be activated! This will result in the live server being considered failed.");
+
synchronized (this)
{
freezeBackupConnection();
@@ -961,10 +961,9 @@
// to load those
deployQueuesFromConfiguration();
- // Deploy any predefined queues - on backup we don't start queue deployer - instead deployments
- // are replicated from live
+ // Deploy any predefined queues
- if (configuration.isFileDeploymentEnabled() && !configuration.isBackup())
+ if (configuration.isFileDeploymentEnabled())
{
queueDeployer = new QueueDeployer(deploymentManager, messagingServerControl);
@@ -1096,7 +1095,7 @@
}
else
{
- log.warn("Backup server MUST be started before live server. Initialisation will proceed.");
+ log.warn("Backup server MUST be started before live server. Initialisation will not proceed.");
return false;
}
@@ -1158,15 +1157,15 @@
}
private void setNodeID() throws Exception
- {
+ {
if (!configuration.isBackup())
- {
+ {
if (uuid == null)
- {
+ {
uuid = storageManager.getPersistentID();
-
+
if (uuid == null)
- {
+ {
uuid = UUIDGenerator.getInstance().generateUUID();
storageManager.setPersistentID(uuid);
@@ -1176,9 +1175,9 @@
}
}
else
- {
+ {
UUID currentUUID = storageManager.getPersistentID();
-
+
if (currentUUID != null)
{
if (!currentUUID.equals(uuid))
More information about the jboss-cvs-commits
mailing list