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

fix intermittent test failure - memorylimittest on jdbc 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1511491 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2013-08-07 21:08:14 +00:00
parent aed6b0054a
commit ae84399b97
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
activemq-unit-tests/src/test/java/org/apache/activemq/usecases/MemoryLimitTest.java
View File

@ -35,6 +35,7 @@ import org.apache.activemq.broker.region.policy.PolicyMap;
import org.apache.activemq.command.ActiveMQQueue; import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.util.ConsumerThread; import org.apache.activemq.util.ConsumerThread;
import org.apache.activemq.util.ProducerThread; import org.apache.activemq.util.ProducerThread;
import org.apache.activemq.util.Wait;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore; import org.junit.Ignore;
@ -127,7 +128,7 @@ public class MemoryLimitTest extends TestSupport {
Thread.sleep(1000); Thread.sleep(1000);
// assert we didn't break high watermark (70%) usage // assert we didn't break high watermark (70%) usage
Destination dest = broker.getDestination((ActiveMQQueue) queue); final Destination dest = broker.getDestination((ActiveMQQueue) queue);
LOG.info("Destination usage: " + dest.getMemoryUsage()); LOG.info("Destination usage: " + dest.getMemoryUsage());
int percentUsage = dest.getMemoryUsage().getPercentUsage(); int percentUsage = dest.getMemoryUsage().getPercentUsage();
assertTrue("Should be less than 70% of limit but was: " + percentUsage, percentUsage <= 71); assertTrue("Should be less than 70% of limit but was: " + percentUsage, percentUsage <= 71);
@ -139,11 +140,16 @@ public class MemoryLimitTest extends TestSupport {
Message msg = consumer.receive(); Message msg = consumer.receive();
msg.acknowledge(); msg.acknowledge();
Thread.sleep(1000);
// this should free some space and allow us to get new batch of messages in the memory // this should free some space and allow us to get new batch of messages in the memory
// exceeding the limit // exceeding the limit
assertTrue("Limit is exceeded", Wait.waitFor(new Wait.Condition() {
@Override
public boolean isSatisified() throws Exception {
LOG.info("Destination usage: " + dest.getMemoryUsage()); LOG.info("Destination usage: " + dest.getMemoryUsage());
assertTrue(dest.getMemoryUsage().getPercentUsage() >= 478); return dest.getMemoryUsage().getPercentUsage() >= 478;
}
}));
LOG.info("Broker usage: " + broker.getSystemUsage().getMemoryUsage()); LOG.info("Broker usage: " + broker.getSystemUsage().getMemoryUsage());
assertTrue(broker.getSystemUsage().getMemoryUsage().getPercentUsage() >= 478); assertTrue(broker.getSystemUsage().getMemoryUsage().getPercentUsage() >= 478);