Merged revisions 598106-598232,598234-598286,598288-598323,598325-598361 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1

........
  r598337 | ritchiem | 2007-11-26 16:33:06 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Last commit accidentally caught my failover change that wasn't complete.
........
  r598352 | rupertlssmith | 2007-11-26 17:17:48 +0000 (Mon, 26 Nov 2007) | 1 line
  
  May have broken build with tktest plugin mojo, commented out until fixed.
........
  r598357 | rupertlssmith | 2007-11-26 17:33:14 +0000 (Mon, 26 Nov 2007) | 1 line
  
  Fixed broken plugin.
........
  r598360 | ritchiem | 2007-11-26 17:49:05 +0000 (Mon, 26 Nov 2007) | 1 line
  
  QPID-690 : Missing Test and code update.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1.1@598363 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 219 insertions, 76 deletions

diff --git a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
index 91f7710025..603b0834a3 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
@@ -7,9 +7,9 @@
  * 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
@@ -31,6 +31,7 @@ public interface BrokerDetails
     */
     public static final String OPTIONS_RETRY = "retries";
     public static final String OPTIONS_CONNECT_TIMEOUT = "connecttimeout";
+    public static final String OPTIONS_CONNECT_DELAY = "connectdelay";
     public static final int DEFAULT_PORT = 5672;
 
     public static final String TCP = "tcp";
@@ -63,9 +64,9 @@ public interface BrokerDetails
     long getTimeout();
 
     void setTimeout(long timeout);
-    
+
     SSLConfiguration getSSLConfiguration();
-    
+
     void setSSLConfiguration(SSLConfiguration sslConfiguration);
 
     String toString();
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
index 4e0d0b79b5..905f7ca3a1 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
@@ -22,7 +22,6 @@ package org.apache.qpid.jms.failover;
 
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionURL;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,34 +34,22 @@ public class FailoverRoundRobinServers implements FailoverMethod
     /** The default number of times to retry each server */
     public static final int DEFAULT_SERVER_RETRIES = 0;
 
-    /**
-      * The index into the hostDetails array of the broker to which we are connected
-      */
+    /** The index into the hostDetails array of the broker to which we are connected */
     private int _currentBrokerIndex = -1;
 
-    /**
-     * The number of times to retry connecting for each server
-     */
+    /** The number of times to retry connecting for each server */
     private int _serverRetries;
 
-    /**
-     * The current number of retry attempts made
-     */
+    /** The current number of retry attempts made */
     private int _currentServerRetry;
 
-    /**
-     *  The number of times to cycle through the servers
-     */
+    /** The number of times to cycle through the servers */
     private int _cycleRetries;
 
-    /**
-     * The current number of cycles performed.
-     */
+    /** The current number of cycles performed. */
     private int _currentCycleRetries;
 
-    /**
-     * Array of BrokerDetail used to make connections.
-     */
+    /** Array of BrokerDetail used to make connections. */
     private ConnectionURL _connectionDetails;
 
     public FailoverRoundRobinServers(ConnectionURL connectionDetails)
@@ -128,6 +115,8 @@ public class FailoverRoundRobinServers implements FailoverMethod
 
     public BrokerDetails getNextBrokerDetails()
     {
+        boolean doDelay = false;
+
         if (_currentBrokerIndex == (_connectionDetails.getBrokerCount() - 1))
         {
             if (_currentServerRetry < _serverRetries)
@@ -143,6 +132,7 @@ public class FailoverRoundRobinServers implements FailoverMethod
                 else
                 {
                     _logger.info("Retrying " + _connectionDetails.getBrokerDetails(_currentBrokerIndex));
+                    doDelay=true;
                 }
 
                 _currentServerRetry++;
@@ -175,6 +165,7 @@ public class FailoverRoundRobinServers implements FailoverMethod
                 else
                 {
                     _logger.info("Retrying " + _connectionDetails.getBrokerDetails(_currentBrokerIndex));
+                    doDelay=true;
                 }
 
                 _currentServerRetry++;
@@ -189,7 +180,28 @@ public class FailoverRoundRobinServers implements FailoverMethod
             }
         }
 
-        return _connectionDetails.getBrokerDetails(_currentBrokerIndex);
+        BrokerDetails broker = _connectionDetails.getBrokerDetails(_currentBrokerIndex);
+
+        String delayStr = broker.getOption(BrokerDetails.OPTIONS_CONNECT_DELAY);
+        if (delayStr != null && doDelay)
+        {
+            Long delay = Long.parseLong(delayStr);
+            _logger.info("Delay between connect retries:" + delay);
+            try
+            {
+                Thread.sleep(delay);
+            }
+            catch (InterruptedException ie)
+            {
+                return null;
+            }
+        }
+        else
+        {
+            _logger.info("No delay between connect retries, use tcp://host:port?connectdelay='value' to enable.");
+        }
+
+        return broker;
     }
 
     public void setBroker(BrokerDetails broker)
diff --git a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
index 68e6d25be0..622842edb9 100644
--- a/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
+++ b/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
@@ -7,9 +7,9 @@
  * 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
@@ -22,25 +22,23 @@ package org.apache.qpid.jms.failover;
 
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionURL;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FailoverSingleServer implements FailoverMethod
 {
+    private static final Logger _logger = LoggerFactory.getLogger(FailoverSingleServer.class);
+
     /** The default number of times to rety a conection to this server */
     public static final int DEFAULT_SERVER_RETRIES = 1;
 
-    /**
-     * The details of the Single Server
-     */
+    /** The details of the Single Server */
     private BrokerDetails _brokerDetail;
 
-    /**
-     * The number of times to retry connecting to the sever
-     */
+    /** The number of times to retry connecting to the sever */
     private int _retries;
 
-    /**
-     * The current number of attempts made to the server
-     */
+    /** The current number of attempts made to the server */
     private int _currentRetries;
 
 
@@ -78,7 +76,7 @@ public class FailoverSingleServer implements FailoverMethod
 
     public BrokerDetails getCurrentBrokerDetails()
     {
-       return _brokerDetail;
+        return _brokerDetail;
     }
 
     public BrokerDetails getNextBrokerDetails()
@@ -91,11 +89,29 @@ public class FailoverSingleServer implements FailoverMethod
         {
             if (_currentRetries < _retries)
             {
-                _currentRetries ++;
+                _currentRetries++;
             }
+        }
 
-            return _brokerDetail;
+
+        String delayStr = _brokerDetail.getOption(BrokerDetails.OPTIONS_CONNECT_DELAY);
+        if (delayStr != null && _currentRetries != 1)
+        {
+            Long delay = Long.parseLong(delayStr);
+            _logger.info("Delay between connect retries:" + delay);
+            try
+            {
+
+                Thread.sleep(delay);
+            }
+            catch (InterruptedException ie)
+            {
+                _logger.info("No delay between connect retries, use tcp://host:port?connectdelay='value' to enable.");
+                return null;
+            }
         }
+
+        return _brokerDetail;
     }
 
     public void setBroker(BrokerDetails broker)
@@ -138,10 +154,10 @@ public class FailoverSingleServer implements FailoverMethod
 
     public String toString()
     {
-        return "SingleServer:\n"+
-                "Max Retries:"+_retries+
-                "\nCurrent Retry:"+_currentRetries+
-                "\n"+_brokerDetail+"\n";
+        return "SingleServer:\n" +
+               "Max Retries:" + _retries +
+               "\nCurrent Retry:" + _currentRetries +
+               "\n" + _brokerDetail + "\n";
     }
 
 }
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index dc462e3925..83e494251d 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -94,42 +94,42 @@
             <plugin>
                 <groupId>uk.co.thebadgerset</groupId>
                 <artifactId>junit-toolkit-maven-plugin</artifactId>
-                <executions>
+
+                <configuration>
+                    <systemproperties>
+                        <property>
+                            <name>log4j.configuration</name>
+                            <value>${log4j.configuration}</value>
+                        </property>
+                    </systemproperties>
+                    
+                    <testrunner>uk.co.thebadgerset.junit.extensions.TKTestRunner</testrunner>
+                    
+                    <testrunneroptions>
+                        <option>-X:decorators "org.apache.qpid.test.framework.qpid.InVMBrokerDecorator:org.apache.qpid.test.framework.qpid.AMQPFeatureDecorator"</option>
+                        <option>-o</option>
+                        <option>--csv</option>
+                    </testrunneroptions>
+                    
+                    <testrunnerproperties>
+                        <property>
+                            <name>notApplicableAssertion</name>
+                            <value>warn</value>
+                        </property>
+                    </testrunnerproperties>
+                    
+                    <commands>
+                        <Immediate-Message-Test>-n Immediate-Test -s[1] org.apache.qpid.test.testcases.ImmediateMessageTest</Immediate-Message-Test>
+                        <Mandatory-Message-Test>-n Mandatory-Test -s[1] org.apache.qpid.test.testcases.MandatoryMessageTest</Mandatory-Message-Test>
+                        <Rollback-Test>-n Rollback-Test -s[1] org.apache.qpid.test.testcases.RollbackTest</Rollback-Test>
+                    </commands>
+                    
+                </configuration>
+
+                <executions>                    
                     <execution>
                         <id>framework_tests</id>
-                        <phase>test</phase>
-
-                        <configuration>
-                            <systemproperties>
-                                <property>
-                                    <name>log4j.configuration</name>
-                                    <value>${log4j.configuration}</value>
-                                </property>
-                            </systemproperties>
-                            
-                            <testrunner>uk.co.thebadgerset.junit.extensions.TKTestRunner</testrunner>
-                            
-                            <testrunneroptions>
-                                <option>-X:decorators "org.apache.qpid.test.framework.qpid.InVMBrokerDecorator:org.apache.qpid.test.framework.qpid.AMQPFeatureDecorator"</option>
-                                <option>-o</option>
-                                <option>--csv</option>
-                            </testrunneroptions>
-                            
-                            <testrunnerproperties>
-                                <property>
-                                    <name>notApplicableAssertion</name>
-                                    <value>warn</value>
-                                </property>
-                            </testrunnerproperties>
-                            
-                            <commands>
-                                <Immediate-Message-Test>-n Immediate-Test -s[1] org.apache.qpid.test.testcases.ImmediateMessageTest</Immediate-Message-Test>
-                                <Mandatory-Message-Test>-n Mandatory-Test -s[1] org.apache.qpid.test.testcases.MandatoryMessageTest</Mandatory-Message-Test>
-                                <Rollback-Test>-n Rollback-Test -s[1] org.apache.qpid.test.testcases.RollbackTest</Rollback-Test>
-                            </commands>
-                            
-                        </configuration>
-                        
+                        <phase>test</phase>                       
                         <goals>
                             <goal>tktest</goal>
                         </goals>                        
diff --git a/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java b/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
new file mode 100644
index 0000000000..d3f79f84b6
--- /dev/null
+++ b/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
@@ -0,0 +1,114 @@
+package org.apache.qpid.server.failover;
+
+import junit.framework.TestCase;
+import org.apache.qpid.AMQDisconnectedException;
+import org.apache.qpid.AMQException;
+import org.apache.qpid.client.AMQConnection;
+import org.apache.qpid.client.AMQConnectionURL;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.client.vmbroker.AMQVMBrokerCreationException;
+import org.apache.qpid.url.URLSyntaxException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jms.ExceptionListener;
+import javax.jms.JMSException;
+import java.util.concurrent.CountDownLatch;/*
+ *
+ * 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.
+ *
+ */
+
+public class FailoverMethodTest extends TestCase implements ExceptionListener
+{
+    private static final Logger _logger = LoggerFactory.getLogger(FailoverMethodTest.class);
+    private CountDownLatch _failoverComplete = new CountDownLatch(1);
+
+    public void setUp() throws AMQVMBrokerCreationException
+    {
+    }
+
+    public void tearDown() throws AMQVMBrokerCreationException
+    {
+    }
+
+    public void testFailoverRoundRobinDelay() throws URLSyntaxException, AMQVMBrokerCreationException, InterruptedException, JMSException
+    {
+        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1;tcp://localhost:5670?connectdelay='2000',retries='3''";
+
+        AMQConnectionURL url = new AMQConnectionURL(connectionString);
+        TransportConnection.createVMBroker(1);
+
+        try
+        {
+            long start = System.currentTimeMillis();
+            AMQConnection connection = new AMQConnection(url, null);
+
+            connection.setExceptionListener(this);
+
+            TransportConnection.killAllVMBrokers();
+
+            _failoverComplete.await();
+            long end = System.currentTimeMillis();
+
+            assertTrue("Failover took at over 10seconds", (end - start) > 6000);
+
+        }
+        catch (AMQException e)
+        {
+            fail(e.getMessage());
+        }
+    }
+
+    public void testFailoverSingleDelay() throws URLSyntaxException, AMQVMBrokerCreationException, InterruptedException, JMSException
+    {
+        String connectionString = "amqp://guest:guest@/test?brokerlist='vm://:1?connectdelay='2000',retries='3''";
+
+        AMQConnectionURL url = new AMQConnectionURL(connectionString);
+        TransportConnection.createVMBroker(1);
+
+        try
+        {
+            long start = System.currentTimeMillis();
+            AMQConnection connection = new AMQConnection(url, null);
+
+            connection.setExceptionListener(this);
+
+            TransportConnection.killAllVMBrokers();
+
+            _failoverComplete.await();
+            long end = System.currentTimeMillis();
+
+            assertTrue("Failover took at over 10seconds", (end - start) > 6000);
+
+        }
+        catch (AMQException e)
+        {
+            fail(e.getMessage());
+        }
+    }
+
+
+    public void onException(JMSException e)
+    {
+        if (e.getLinkedException() instanceof AMQDisconnectedException)
+        {
+            _failoverComplete.countDown();
+        }
+    }
+}