Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

apply fix for: https://issues.apache.org/jira/browse/AMQ-4288 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1441156 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2013-01-31 19:34:22 +00:00
parent fe2489fc4b
commit 7f022c9379
1 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
activemq-unit-tests/src/test/java/org/apache/activemq/OptimizedAckTest.java
View File

@ -70,21 +70,22 @@ public class OptimizedAckTest extends TestSupport {
} }
})); }));
for (int i = 0; i < 10; i++) { for (int i = 0; i < 6; i++) {
javax.jms.Message msg = consumer.receive(4000); javax.jms.Message msg = consumer.receive(4000);
long inFlightCount = regionBroker.getDestinationStatistics().getInflight().getCount();
assertNotNull(msg); assertNotNull(msg);
if (i < 7) { assertEquals("all prefetch is still in flight: " + i, 10, regionBroker.getDestinationStatistics().getInflight().getCount());
assertEquals("all prefetch is still in flight", 10, inFlightCount); }
} else {
assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() { for (int i = 6; i < 10; i++) {
@Override javax.jms.Message msg = consumer.receive(4000);
public boolean isSatisified() throws Exception { assertNotNull(msg);
LOG.info("inflight count: " + regionBroker.getDestinationStatistics().getInflight().getCount());
return 3 == regionBroker.getDestinationStatistics().getInflight().getCount(); assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() {
} @Override
})); public boolean isSatisified() throws Exception {
} return 3 == regionBroker.getDestinationStatistics().getInflight().getCount();
}
}));
} }
} }
@ -108,22 +109,26 @@ public class OptimizedAckTest extends TestSupport {
} }
})); }));
for (int i = 0; i < 10; i++) { for (int i = 0; i < 6; i++) {
Thread.sleep(400); Thread.sleep(400);
javax.jms.Message msg = consumer.receive(4000); javax.jms.Message msg = consumer.receive(4000);
long inFlightCount = regionBroker.getDestinationStatistics().getInflight().getCount();
assertNotNull(msg); assertNotNull(msg);
if (i < 7) { assertEquals("all prefetch is still in flight: " + i, 10, regionBroker.getDestinationStatistics().getInflight().getCount());
assertEquals("all prefetch is still in flight: " + i, 10, inFlightCount);
} else {
assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return 3 == regionBroker.getDestinationStatistics().getInflight().getCount();
}
}));
}
} }
for (int i = 6; i < 10; i++) {
Thread.sleep(400);
javax.jms.Message msg = consumer.receive(4000);
assertNotNull(msg);
assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
return 3 == regionBroker.getDestinationStatistics().getInflight().getCount();
}
}));
}
} }
public void testReceivedMessageNotInFlightAfterScheduledAckFires() throws Exception { public void testReceivedMessageNotInFlightAfterScheduledAckFires() throws Exception {
@ -147,21 +152,21 @@ public class OptimizedAckTest extends TestSupport {
} }
})); }));
for (int i = 0; i < 10; i++) { for (int i = 0; i < 6; i++) {
javax.jms.Message msg = consumer.receive(4000); javax.jms.Message msg = consumer.receive(4000);
long inFlightCount = regionBroker.getDestinationStatistics().getInflight().getCount();
assertNotNull(msg); assertNotNull(msg);
if (i < 7) { assertEquals("all prefetch is still in flight: " + i, 10, regionBroker.getDestinationStatistics().getInflight().getCount());
assertEquals("all prefetch is still in flight", 10, inFlightCount); }
} else {
assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() { for (int i = 6; i < 10; i++) {
@Override javax.jms.Message msg = consumer.receive(4000);
public boolean isSatisified() throws Exception { assertNotNull(msg);
LOG.info("inflight count: " + regionBroker.getDestinationStatistics().getInflight().getCount()); assertTrue("most are acked but 3 remain", Wait.waitFor(new Wait.Condition() {
return 3 == regionBroker.getDestinationStatistics().getInflight().getCount(); @Override
} public boolean isSatisified() throws Exception {
})); return 3 == regionBroker.getDestinationStatistics().getInflight().getCount();
} }
}));
} }
assertTrue("After delay the scheduled ack should ack all inflight.", Wait.waitFor(new Wait.Condition() { assertTrue("After delay the scheduled ack should ack all inflight.", Wait.waitFor(new Wait.Condition() {