You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2016/05/05 10:16:22 UTC
svn commit: r1742395 - in /qpid/java/branches/6.0.x: ./
systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
Author: orudyy
Date: Thu May 5 10:16:22 2016
New Revision: 1742395
URL: http://svn.apache.org/viewvc?rev=1742395&view=rev
Log:
QPID-7120: Fix sporadically failing AbruptClientDisconnectTest.testMessagingOnAbruptConnectivityLostWhilstConsuming
merged from trunk using
svn merge -c 1733467 ^/qpid/java/trunk
Modified:
qpid/java/branches/6.0.x/ (props changed)
qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 5 10:16:22 2016
@@ -9,5 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-1729
657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732525,1732812,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722416,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727532,1727555,1727608,1727951,1727954,1728089,1728167,1728302,1728497,1728501,1728524,1728639,1728651,1728772,1729215,1729297,1729347,1729356,1729406,1729408,1729412,1729515,1729638,1729656-1729
657,1729783,1729828,1729832,1729841,1729851,1729886,1729904,1729973,1730019,1730025,1730052,1730072,1730088,1730494,1730499,1730547,1730559,1730567,1730578,1730585,1730651,1730697,1730712-1730713,1730805,1731029,1731110,1731210,1731225,1731444,1731551,1731612,1732184,1732452,1732461,1732525,1732812,1733467,1734452,1736478,1736751,1736838,1737804,1737835,1737853,1737984,1737992,1738119,1738135,1738231,1738271,1738607,1738610,1738731,1738914,1741702,1742257,1742284
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java?rev=1742395&r1=1742394&r2=1742395&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java (original)
+++ qpid/java/branches/6.0.x/systests/src/test/java/org/apache/qpid/server/AbruptClientDisconnectTest.java Thu May 5 10:16:22 2016
@@ -167,8 +167,14 @@ public class AbruptClientDisconnectTest
@Override
public void run()
{
- producer.stop();
- _tcpTunneler.disconnect(clientMonitor.getClientAddress());
+ try
+ {
+ _tcpTunneler.disconnect(clientMonitor.getClientAddress());
+ }
+ finally
+ {
+ producer.stop();
+ }
}
}
);
@@ -183,6 +189,8 @@ public class AbruptClientDisconnectTest
_executorService.submit(consumer);
boolean disconnectOccurred = clientMonitor.awaitDisconnect(10, TimeUnit.SECONDS);
+
+ LOGGER.debug("Stopping consumer and producer");
consumer.stop();
producer.stop();
@@ -239,19 +247,32 @@ public class AbruptClientDisconnectTest
while (expectedIndex < toIndex)
{
Message message = consumer.receive(RECEIVE_TIMEOUT);
- assertNotNull("Expected message with index " + expectedIndex + " but got null", message);
- int messageIndex = message.getIntProperty(INDEX);
- LOGGER.debug("Received message with index {}, expected index is {}", messageIndex, expectedIndex);
- if (messageIndex != expectedIndex
- && expectedIndex == fromIndex
- && messageIndex == consumerLastSeenMessageIndex + 1)
+ if (message == null && consumerLastSeenMessageIndex + 1 == toIndex)
{
+ // this is a corner case when one remaining message is expected
+ // but it was already received previously, Commit was sent
+ // and broker successfully committed and sent back CommitOk
+ // but CommitOk did not reach client due to abrupt disconnect
LOGGER.debug( "Broker transaction was completed for message {}"
- + " but there was no network to notify client about its completion.",
+ + " but there was no network to notify client about its completion.",
consumerLastSeenMessageIndex);
- expectedIndex = messageIndex;
}
- assertEquals("Unexpected message index", expectedIndex, messageIndex);
+ else
+ {
+ assertNotNull("Expected message with index " + expectedIndex + " but got null", message);
+ int messageIndex = message.getIntProperty(INDEX);
+ LOGGER.debug("Received message with index {}, expected index is {}", messageIndex, expectedIndex);
+ if (messageIndex != expectedIndex
+ && expectedIndex == fromIndex
+ && messageIndex == consumerLastSeenMessageIndex + 1)
+ {
+ LOGGER.debug("Broker transaction was completed for message {}"
+ + " but there was no network to notify client about its completion.",
+ consumerLastSeenMessageIndex);
+ expectedIndex = messageIndex;
+ }
+ assertEquals("Unexpected message index", expectedIndex, messageIndex);
+ }
expectedIndex++;
}
session.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org