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

resolve https://issues.apache.org/activemq/browse/AMQ-2285 - pull file locking outside setting opened state so that an open does not ocurr unless the lock is available, sorts out Npe on shutdown 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@783384 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Tully 2009-06-10 14:59:02 +00:00
parent a88a513e3c
commit 38b840a61f
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
View File

@ -218,26 +218,25 @@ public class MessageDatabase {
* @throws IOException * @throws IOException
*/ */
public void open() throws IOException { public void open() throws IOException {
File lockFileName = new File(directory, "lock");
lockFile = new LockFile(lockFileName, true);
if (failIfDatabaseIsLocked) {
lockFile.lock();
} else {
while (true) {
try {
lockFile.lock();
break;
} catch (IOException e) {
LOG.info("Database "+lockFileName+" is locked... waiting " + (DATABASE_LOCKED_WAIT_DELAY / 1000) + " seconds for the database to be unlocked. Reason: " + e);
try {
Thread.sleep(DATABASE_LOCKED_WAIT_DELAY);
} catch (InterruptedException e1) {
}
}
}
}
if( opened.compareAndSet(false, true) ) { if( opened.compareAndSet(false, true) ) {
File lockFileName = new File(directory, "lock");
lockFile = new LockFile(lockFileName, true);
if (failIfDatabaseIsLocked) {
lockFile.lock();
} else {
while (true) {
try {
lockFile.lock();
break;
} catch (IOException e) {
LOG.info("Database "+lockFileName+" is locked... waiting " + (DATABASE_LOCKED_WAIT_DELAY / 1000) + " seconds for the database to be unlocked. Reason: " + e);
try {
Thread.sleep(DATABASE_LOCKED_WAIT_DELAY);
} catch (InterruptedException e1) {
}
}
}
}
getJournal().start(); getJournal().start();
loadPageFile(); loadPageFile();
@ -312,7 +311,7 @@ public class MessageDatabase {
public void unload() throws IOException, InterruptedException { public void unload() throws IOException, InterruptedException {
synchronized (indexMutex) { synchronized (indexMutex) {
if( pageFile.isLoaded() ) { if( pageFile != null && pageFile.isLoaded() ) {
metadata.state = CLOSED_STATE; metadata.state = CLOSED_STATE;
metadata.firstInProgressTransactionLocation = getFirstInProgressTxLocation(); metadata.firstInProgressTransactionLocation = getFirstInProgressTxLocation();

2
activemq-core/src/test/java/org/apache/activemq/store/kahadb/KahaDBStoreBrokerTest.java
View File

@ -17,11 +17,9 @@
package org.apache.activemq.store.kahadb; package org.apache.activemq.store.kahadb;
import java.io.File; import java.io.File;
import java.net.URI;
import junit.framework.Test; import junit.framework.Test;
import org.apache.activemq.broker.BrokerFactory;
import org.apache.activemq.broker.BrokerService; import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.BrokerTest; import org.apache.activemq.broker.BrokerTest;