Repository: activemq Updated Branches: refs/heads/master 8b064889c -> c1cbf509d
[AMQ-6644] - ensure journal files past last update are not included in the logged gc set in error Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c1cbf509 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c1cbf509 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c1cbf509 Branch: refs/heads/master Commit: c1cbf509da996ccbd522934d4a927d2164054c76 Parents: 8b06488 Author: gtully <[email protected]> Authored: Tue Apr 4 12:21:31 2017 +0100 Committer: gtully <[email protected]> Committed: Tue Apr 4 12:21:31 2017 +0100 ---------------------------------------------------------------------- .../java/org/apache/activemq/store/kahadb/MessageDatabase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/c1cbf509/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java index 0611be7..8a7490f 100644 --- a/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java +++ b/activemq-kahadb-store/src/main/java/org/apache/activemq/store/kahadb/MessageDatabase.java @@ -1742,7 +1742,8 @@ public abstract class MessageDatabase extends ServiceSupport implements BrokerSe } if (lastUpdate != null) { - gcCandidateSet.remove(lastUpdate.getDataFileId()); + // we won't delete past the last update, ackCompaction journal can be a candidate in error + gcCandidateSet.removeAll(new TreeSet<Integer>(gcCandidateSet.tailSet(lastUpdate.getDataFileId()))); } // Don't GC files under replication
