You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by de...@apache.org on 2011/08/03 15:35:36 UTC
svn commit: r1153482 -
/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Author: dejanb
Date: Wed Aug 3 13:35:35 2011
New Revision: 1153482
URL: http://svn.apache.org/viewvc?rev=1153482&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3422 - don't remove journal file with current producer tracker
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java?rev=1153482&r1=1153481&r2=1153482&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java Wed Aug 3 13:35:35 2011
@@ -1178,12 +1178,15 @@ public class MessageDatabase extends Ser
gcCandidateSet.removeAll(journalFilesBeingReplicated);
}
+ if (metadata.producerSequenceIdTrackerLocation != null) {
+ gcCandidateSet.remove(metadata.producerSequenceIdTrackerLocation.getDataFileId());
+ }
+
// Don't GC files after the first in progress tx
if (metadata.firstInProgressTransactionLocation != null) {
if (metadata.firstInProgressTransactionLocation.getDataFileId() < firstTxLocation.getDataFileId()) {
firstTxLocation = metadata.firstInProgressTransactionLocation;
}
- ;
}
if (firstTxLocation != null) {