Author: ritchiem
Date: Mon Nov 26 10:03:37 2007
New Revision: 598363
URL: http://svn.apache.org/viewvc?rev=598363&view=rev
Log:
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.
........
Added:
incubator/qpid/branches/M2.1.1/java/systests/src/main/java/org/apache/qpid/server/failover/
- copied from r598360,
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/failover/
incubator/qpid/branches/M2.1.1/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
- copied unchanged from r598360,
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/failover/FailoverMethodTest.java
Modified:
incubator/qpid/branches/M2.1.1/ (props changed)
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
incubator/qpid/branches/M2.1.1/java/systests/pom.xml
Propchange: incubator/qpid/branches/M2.1.1/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Nov 26 10:03:37 2007
@@ -1 +1 @@
-/incubator/qpid/branches/M2:1-568187,574873,574876,575253,575663-578604,587061-587924,587926-590773,590775-591035,591037-591059,591061-591090,591092-592353
/incubator/qpid/branches/M2.1:1-598104,598106-598323
+/incubator/qpid/branches/M2:1-568187,574873,574876,575253,575663-578604,587061-587924,587926-590773,590775-591035,591037-591059,591061-591090,591092-592353
/incubator/qpid/branches/M2.1:1-598104,598106-598323,598325-598361
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java?rev=598363&r1=598362&r2=598363&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
Mon Nov 26 10:03:37 2007
@@ -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 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 @@
long getTimeout();
void setTimeout(long timeout);
-
+
SSLConfiguration getSSLConfiguration();
-
+
void setSSLConfiguration(SSLConfiguration sslConfiguration);
String toString();
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java?rev=598363&r1=598362&r2=598363&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverRoundRobinServers.java
Mon Nov 26 10:03:37 2007
@@ -22,7 +22,6 @@
import org.apache.qpid.jms.BrokerDetails;
import org.apache.qpid.jms.ConnectionURL;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -35,34 +34,22 @@
/** 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 BrokerDetails getNextBrokerDetails()
{
+ boolean doDelay = false;
+
if (_currentBrokerIndex == (_connectionDetails.getBrokerCount() - 1))
{
if (_currentServerRetry < _serverRetries)
@@ -143,6 +132,7 @@
else
{
_logger.info("Retrying " +
_connectionDetails.getBrokerDetails(_currentBrokerIndex));
+ doDelay=true;
}
_currentServerRetry++;
@@ -175,6 +165,7 @@
else
{
_logger.info("Retrying " +
_connectionDetails.getBrokerDetails(_currentBrokerIndex));
+ doDelay=true;
}
_currentServerRetry++;
@@ -189,7 +180,28 @@
}
}
- 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)
Modified:
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java?rev=598363&r1=598362&r2=598363&view=diff
==============================================================================
---
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
(original)
+++
incubator/qpid/branches/M2.1.1/java/client/src/main/java/org/apache/qpid/jms/failover/FailoverSingleServer.java
Mon Nov 26 10:03:37 2007
@@ -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 @@
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 BrokerDetails getCurrentBrokerDetails()
{
- return _brokerDetail;
+ return _brokerDetail;
}
public BrokerDetails getNextBrokerDetails()
@@ -91,11 +89,29 @@
{
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 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";
}
}
Modified: incubator/qpid/branches/M2.1.1/java/systests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1.1/java/systests/pom.xml?rev=598363&r1=598362&r2=598363&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1.1/java/systests/pom.xml (original)
+++ incubator/qpid/branches/M2.1.1/java/systests/pom.xml Mon Nov 26 10:03:37
2007
@@ -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>
