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

Fix the failing QueueMasterSlaveTestUsingSharedFileTest test.. due to chang in startup order of the persistence adapter. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@661439 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2008-05-29 19:23:18 +00:00
parent 2b3b7f565c
commit 1973ca8f3e
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java
View File

@ -128,6 +128,8 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
private FileLock lock;
private boolean disableLocking = DISABLE_LOCKING;
private boolean failIfJournalIsLocked;
private boolean lockLogged;
private boolean lockAquired;
public String getBrokerName() {
return this.brokerName;
@ -271,6 +273,14 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
}
};
Scheduler.executePeriodically(periodicCleanupTask, cleanupInterval);
if (lockAquired && lockLogged) {
LOG.info("Aquired lock for AMQ Store" + getDirectory());
if (brokerService != null) {
brokerService.getBroker().nowMasterBroker();
}
}
}
public void stop() throws Exception {
@ -923,27 +933,20 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
protected void lock() throws Exception {
boolean logged = false;
boolean aquiredLock = false;
lockLogged = false;
lockAquired = false;
do {
if (doLock()) {
aquiredLock = true;
lockAquired = true;
} else {
if (!logged) {
if (!lockLogged) {
LOG.warn("Waiting to Lock the Store " + getDirectory());
logged = true;
lockLogged = true;
}
Thread.sleep(1000);
}
if (aquiredLock && logged) {
LOG.info("Aquired lock for AMQ Store" + getDirectory());
if (brokerService != null) {
brokerService.getBroker().nowMasterBroker();
}
}
} while (!aquiredLock && !disableLocking);
} while (!lockAquired && !disableLocking);
}
private synchronized void unlock() throws IOException {