QPID-1119 : M2x commit : Addition of a System property to AMQProtocolHandler.java to allow the syncWait default to be changed. To perform this a new SlowMessageStore has been added to the systest package. This allows all MessageStore methods to have a pre and/or post delay applied. This delay can be configured dynamically if you have a handle to the Store or via the XML configuration. The SlowMessageStore can also be used to wrap any existing MessageStore (Testing only carried out with the default MemoryMessageStore)

    To make testing easier on M2x VMTestCase has been modified to allow the test to simply configure logging levels and systemProperties. These are then reverted after the test has completed.

    These changes will naturally need more work to before they are merged to trunk which uses totally different methods for ClientProperties and for running tests.

    systests/pom.xml didn't have amqj.logging.level as a systemProperty hence setting it did nothing for the tests.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@688110 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 125 insertions, 0 deletions

diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
new file mode 100644
index 0000000000..f2c8a5e1f5
--- /dev/null
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/client/timeouts/SyncWaitDelayTest.java
@@ -0,0 +1,125 @@
+/*
+ *
+ * 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.qpid.test.client.timeouts;
+
+import org.apache.commons.configuration.Configuration;
+import org.apache.qpid.server.registry.ConfigurationFileApplicationRegistry;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.test.utils.QpidTestCase;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import java.io.File;
+
+/**
+ * This tests that when the commit takes a long time(due to POST_COMMIT_DELAY) that the commit does not timeout
+ * This test must be run in conjunction with SyncWaiteTimeoutDelay or be run with POST_COMMIT_DELAY > 30s to ensure
+ * that the default value is being replaced.
+ */
+public class SyncWaitDelayTest extends QpidTestCase
+{
+    protected static final Logger _logger = LoggerFactory.getLogger(SyncWaitDelayTest.class);
+
+    final String QpidHome = System.getProperty("QPID_HOME");
+    final File _configFile = new File(QpidHome, "etc/config.xml");
+
+    private String VIRTUALHOST = "test";
+    protected long POST_COMMIT_DELAY = 1000L;
+    protected long SYNC_WRITE_TIMEOUT = POST_COMMIT_DELAY + 1000;
+
+    protected Connection _connection;
+    protected Session _session;
+    protected Queue _queue;
+    protected MessageConsumer _consumer;
+
+    public void setUp() throws Exception
+    {
+        super.setUp();
+        stopBroker();
+        if (!_configFile.exists())
+        {
+            fail("Unable to test without config file:" + _configFile);
+        }
+
+        ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(_configFile);
+
+        //Disable management on broker.
+        config.getConfiguration().setProperty("management.enabled", "false");
+
+        Configuration testVirtualhost = config.getConfiguration().subset("virtualhosts.virtualhost." + VIRTUALHOST);
+        testVirtualhost.setProperty("store.class", "org.apache.qpid.server.store.SlowMessageStore");
+        testVirtualhost.setProperty("store.delays.commitTran.post", POST_COMMIT_DELAY);
+
+        startBroker(1, config);
+
+        //Set the syncWrite timeout to be just larger than the delay on the commitTran.
+        setSystemProperty("amqj.default_syncwrite_timeout", String.valueOf(SYNC_WRITE_TIMEOUT));
+
+        _connection = getConnection();
+
+        //Create Queue        
+        _queue = (Queue) getInitialContext().lookup("queue");
+
+        //Create Consumer
+        _session = _connection.createSession(true, Session.SESSION_TRANSACTED);
+
+        //Ensure Queue exists
+        _session.createConsumer(_queue).close();
+    }
+
+
+    public void test() throws JMSException
+    {
+        MessageProducer producer = _session.createProducer(_queue);
+
+        Message message = _session.createTextMessage("Message");
+
+        producer.send(message);
+
+        long start = System.nanoTime();
+
+        _logger.info("Calling Commit");
+
+        try
+        {
+            _session.commit();
+            long end = System.nanoTime();
+            long time = (end - start);
+            // As we are using Nano time ensure to multiply up the millis.
+            assertTrue("Commit was quickier than the delay:" + time, time > 1000000L * POST_COMMIT_DELAY);
+            assertFalse("Commit was to slower than the build in default", time > 1000000L * 1000 * 30);
+        }
+        catch (JMSException e)
+        {
+            fail(e.getMessage());
+        }
+
+    }
+
+}