athanatos commented on a change in pull request #876: Issue 870:
ScanAndCompareGarbageCollector: harden against LM bugs
URL: https://github.com/apache/bookkeeper/pull/876#discussion_r158103006
##########
File path:
bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/ScanAndCompareGarbageCollector.java
##########
@@ -134,27 +124,50 @@ public void gc(GarbageCleaner garbageCleaner) {
lastOverReplicatedLedgerGcTimeMillis = MathUtils.now();
}
- while (ledgerRangeIterator.hasNext()) {
- LedgerRange lRange = ledgerRangeIterator.next();
-
- Long start = lastEnd + 1;
- Long end = lRange.end();
- if (!ledgerRangeIterator.hasNext()) {
+ // Iterate over all the ledger on the metadata store
+ LedgerRangeIterator ledgerRangeIterator =
ledgerManager.getLedgerRanges();
+ Set<Long> ledgersInMetadata = null;
+ long start;
+ long end = -1;
+ boolean done = false;
+ while (!done) {
+ start = end + 1;
+ if (ledgerRangeIterator.hasNext()) {
+ LedgerRange lRange = ledgerRangeIterator.next();
+ ledgersInMetadata = lRange.getLedgers();
+ end = lRange.end();
+ } else {
+ ledgersInMetadata = new TreeSet<>();
end = Long.MAX_VALUE;
+ done = true;
}
Iterable<Long> subBkActiveLedgers =
bkActiveLedgers.subSet(start, true, end, true);
- Set<Long> ledgersInMetadata = lRange.getLedgers();
if (LOG.isDebugEnabled()) {
LOG.debug("Active in metadata {}, Active in bookie {}",
ledgersInMetadata, subBkActiveLedgers);
}
for (Long bkLid : subBkActiveLedgers) {
if (!ledgersInMetadata.contains(bkLid)) {
+ if (conf.getVerifyMetadataOnGC()) {
Review comment:
The price of the config read seems to me to be trivial compared to the cost
of querying zk. I'm inclined to keep it simple.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
