Author: robbie
Date: Mon Feb 13 00:49:20 2012
New Revision: 1243382
URL: http://svn.apache.org/viewvc?rev=1243382&view=rev
Log:
QPID-3803: increase receive() timeout on persistent runs, newest failure log
shows the consumer timed out while recieving, before the publisher completed
sending all the messages.
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java?rev=1243382&r1=1243381&r2=1243382&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
Mon Feb 13 00:49:20 2012
@@ -56,6 +56,7 @@ public class SortedQueueTest extends Qpi
private Connection _producerConnection;
private Session _producerSession;
private Connection _consumerConnection;
+ private long _receiveInterval;
protected void setUp() throws Exception
{
@@ -66,6 +67,7 @@ public class SortedQueueTest extends Qpi
_producerConnection = getConnection();
_consumerConnection = getConnection();
_producerSession = _producerConnection.createSession(true,
Session.SESSION_TRANSACTED);
+ _receiveInterval = isBrokerStorePersistent() ? 3000l : 1500l;
}
protected void tearDown() throws Exception
@@ -96,7 +98,7 @@ public class SortedQueueTest extends Qpi
_consumerConnection.start();
TextMessage received;
int messageCount = 0;
- while((received = (TextMessage) consumer.receive(1000)) != null)
+ while((received = (TextMessage) consumer.receive(_receiveInterval)) !=
null)
{
assertEquals("Received message with unexpected sorted key value",
VALUES_SORTED[messageCount],
received.getStringProperty(TEST_SORT_KEY));
@@ -214,8 +216,7 @@ public class SortedQueueTest extends Qpi
TextMessage received = null;
int messageCount = 0;
- long receiveInterval = isBrokerStorePersistent() ? 3000l : 1000l;
- while((received = (TextMessage) consumer.receive(receiveInterval)) !=
null)
+ while((received = (TextMessage) consumer.receive(_receiveInterval)) !=
null)
{
assertEquals("Received message with unexpected sorted key value",
"samesortkeyvalue",
received.getStringProperty(TEST_SORT_KEY));
@@ -251,7 +252,7 @@ public class SortedQueueTest extends Qpi
TextMessage received;
int messageCount = 0;
- while((received = (TextMessage) consumer.receive(1000)) != null)
+ while((received = (TextMessage) consumer.receive(_receiveInterval)) !=
null)
{
assertEquals("Received message with unexpected sorted key value",
SUBSET_KEYS[messageCount / 10],
received.getStringProperty(TEST_SORT_KEY));
@@ -366,7 +367,7 @@ public class SortedQueueTest extends Qpi
private Message assertReceiveMessage(final MessageConsumer consumer)
throws JMSException
{
- final Message received = (TextMessage) consumer.receive(10000);
+ final Message received = (TextMessage)
consumer.receive(_receiveInterval);
assertNotNull("Received message is unexpectedly null", received);
return received;
}
@@ -406,7 +407,7 @@ public class SortedQueueTest extends Qpi
conn.start();
Message msg;
- while((msg = consumer.receive(1000)) != null)
+ while((msg = consumer.receive(_receiveInterval)) != null)
{
if(_sessionType == Session.SESSION_TRANSACTED)
{
@@ -444,7 +445,7 @@ public class SortedQueueTest extends Qpi
_count++;
LOGGER.debug("Message consumed with key: " +
msg.getStringProperty(TEST_SORT_KEY));
- LOGGER.debug("Message consumed with consumed index: " +
_consumed);
+ LOGGER.debug("Message consumed with consumed index: " +
_consumed.get());
}
_stopped = true;
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
