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

fix for failing test, the check for inactive durables was waiting exactly as long as the housekeeping thread's sleep interval which could cause it to sometimes miss the very last run of the housekeeper and falsely detect leftover inactive ones. Make the test wait for longer than the sleep interval and also provide a clean shutdown of the house-keeper thread. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1431700 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Timothy A. Bish 2013-01-10 22:19:56 +00:00
parent 86afe187c1
commit c0b39615d4
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
activemq-core/src/test/java/org/apache/activemq/usecases/DurableSubDelayedUnsubscribeTest.java
View File

@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Vector;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.jms.Connection;
@ -96,6 +97,8 @@ public class DurableSubDelayedUnsubscribeTest {
final BrokerService brokerService = this.broker;
// Wait for all client subscription to be unsubscribed or swept away.
// Ensure we sleep longer than the housekeeper's sweep delay otherwise we can
// miss the fact that all durables that were abandoned do finally get cleaned up.
assertTrue("should have only one inactiveSubscriber subscribed but was: " + brokerService.getAdminView().getInactiveDurableTopicSubscribers().length,
Wait.waitFor(new Wait.Condition() {
@ -104,7 +107,7 @@ public class DurableSubDelayedUnsubscribeTest {
public boolean isSatisified() throws Exception {
return brokerService.getAdminView().getInactiveDurableTopicSubscribers().length == 1;
}
}, TimeUnit.MINUTES.toMillis(3)));
}, TimeUnit.MINUTES.toMillis(houseKeeper.SWEEP_DELAY * 2)));
assertTrue("should be no subscribers subscribed but was: " + brokerService.getAdminView().getDurableTopicSubscribers().length,
Wait.waitFor(new Wait.Condition() {
@ -138,6 +141,9 @@ public class DurableSubDelayedUnsubscribeTest {
}
}, TimeUnit.MINUTES.toMillis(3)));
// Be good and cleanup our mess a bit.
this.houseKeeper.shutdown();
assertTrue("no exceptions: " + exceptions, exceptions.isEmpty());
LOG.info("DONE.");
@ -575,6 +581,10 @@ public class DurableSubDelayedUnsubscribeTest {
*/
private final class HouseKeeper extends Thread {
private final AtomicBoolean done = new AtomicBoolean();
public final long SWEEP_DELAY = TimeUnit.MINUTES.toMillis(3);
private HouseKeeper() {
super("HouseKeeper");
setDaemon(true);
@ -582,11 +592,26 @@ public class DurableSubDelayedUnsubscribeTest {
public final CopyOnWriteArrayList<String> abandonedSubscriptions = new CopyOnWriteArrayList<String>();
public void shutdown() throws Exception {
done.set(true);
// In case we are sleeping, abort the sleep.
this.interrupt();
// Wait for run to complete.
this.join(TimeUnit.MINUTES.toMillis(SWEEP_DELAY));
// Ensure all abandoned subscriptions get wiped.
if (!abandonedSubscriptions.isEmpty()) {
this.sweep();
}
}
@Override
public void run() {
while (true) {
while (!done.get()) {
try {
Thread.sleep(3 * 60 * 1000);
Thread.sleep(SWEEP_DELAY);
processLock.readLock().lock();
try {
@ -679,7 +704,6 @@ public class DurableSubDelayedUnsubscribeTest {
clientManager = new ClientManager();
server = new Server();
houseKeeper = new HouseKeeper();
}
@After