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

Fix for the DefaultStoreXARecoveryBrokerTest test failure. 

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@545289 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2007-06-07 20:00:37 +00:00
parent 70706ef20a
commit 21211dd6a1
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,14 +175,26 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener,
}
},"ActiveMQ Journal Checkpoint Worker");
createTransactionStore();
if(referenceStoreAdapter.isStoreValid()==false){
log.warn("The ReferenceStore is not valid - recovering ...");
recover();
log.info("Finished recovering the ReferenceStore");
}else {
Location location=writeTraceMessage("RECOVERED "+new Date(),true);
asyncDataManager.setMark(location,true);
}
//
// The following was attempting to reduce startup times by avoiding the log
// file scanning that recovery performs. The problem with it is that XA transactions
// only live in transaction log and are not stored in the reference store, but they still
// need to be recovered when the broker starts up. Perhaps on a graceful shutdown we
// should record all the in flight XA transactions to a file to avoid having to scan
// the entire transaction log. For now going to comment this bit out.
//
// if(referenceStoreAdapter.isStoreValid()==false){
// log.warn("The ReferenceStore is not valid - recovering ...");
// recover();
// log.info("Finished recovering the ReferenceStore");
// }else {
// Location location=writeTraceMessage("RECOVERED "+new Date(),true);
// asyncDataManager.setMark(location,true);
// }
recover();
// Do a checkpoint periodically.
periodicCheckpointTask=new Runnable(){