This repository has been archived by the owner on Apr 30, 2019. It is now read-only.
forked from apache/bookkeeper
-
Notifications
You must be signed in to change notification settings - Fork 9
Add sanity check in GC to prevent active ledger deletion #15
Open
rdhabalia
wants to merge
3
commits into
YahooArchive:yahoo-4.3
Choose a base branch
from
rdhabalia:gc_sanity_check
base: yahoo-4.3
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -27,6 +27,7 @@ | |
import java.util.SortedMap; | ||
import java.util.concurrent.CountDownLatch; | ||
import java.util.concurrent.Semaphore; | ||
import java.util.concurrent.atomic.AtomicBoolean; | ||
|
||
import org.apache.bookkeeper.bookie.GarbageCollectorThread.CompactableLedgerStorage; | ||
import org.apache.bookkeeper.client.BKException; | ||
|
@@ -87,13 +88,13 @@ public void gc(GarbageCleaner garbageCleaner) { | |
// Get a set of all ledgers on the bookie | ||
NavigableSet<Long> bkActiveLedgers = Sets.newTreeSet(ledgerStorage.getActiveLedgersInRange(0, Long.MAX_VALUE)); | ||
|
||
Semaphore semaphore = new Semaphore(MAX_CONCURRENT_ZK_REQUESTS); | ||
// Iterate over all the ledger on the metadata store | ||
LedgerRangeIterator ledgerRangeIterator = ledgerManager.getLedgerRanges(); | ||
|
||
if (!ledgerRangeIterator.hasNext()) { | ||
// Empty global active ledgers, need to remove all local active ledgers. | ||
for (long ledgerId : bkActiveLedgers) { | ||
garbageCleaner.clean(ledgerId); | ||
gcLedgerSafely(garbageCleaner, ledgerId, ledgerManager, semaphore); | ||
} | ||
} | ||
|
||
|
@@ -127,7 +128,7 @@ public void gc(GarbageCleaner garbageCleaner) { | |
} | ||
for (Long bkLid : subBkActiveLedgers) { | ||
if (!ledgersInMetadata.contains(bkLid)) { | ||
garbageCleaner.clean(bkLid); | ||
gcLedgerSafely(garbageCleaner, bkLid, ledgerManager, semaphore); | ||
} | ||
} | ||
lastEnd = end; | ||
|
@@ -138,6 +139,38 @@ public void gc(GarbageCleaner garbageCleaner) { | |
} | ||
} | ||
|
||
/** | ||
* Cleans ledger safely by verifying ledger-metadata is deleted from the zk else it skips ledger-gc if ledger-metada | ||
* exists in zk. | ||
* | ||
* @param garbageCleaner | ||
* @param ledgerId | ||
* @param ledgerManager | ||
* @param semaphore | ||
* @throws InterruptedException | ||
*/ | ||
private void gcLedgerSafely(GarbageCleaner garbageCleaner, long ledgerId, LedgerManager ledgerManager, | ||
Semaphore semaphore) throws InterruptedException { | ||
semaphore.acquire(); | ||
CountDownLatch latch = new CountDownLatch(1); | ||
AtomicBoolean ledgerDeleted = new AtomicBoolean(false); | ||
ledgerManager.existsLedgerMetadata(ledgerId, (rc, exists) -> { | ||
if (rc == BKException.Code.NoSuchLedgerExistsException) { | ||
ledgerDeleted.set(true); | ||
} else if (rc == BKException.Code.OK) { | ||
LOG.warn("Can't delete ledger {} with metadata exists in zk ", ledgerId); | ||
} else { | ||
LOG.warn("Fail to check {} exists in zk {}", ledgerId, BKException.getMessage(rc)); | ||
} | ||
latch.countDown(); | ||
semaphore.release(); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I don't think we need a semaphore at all. Except during unit tests the gc method is called by if garbageCleaner.clean was inside the callback then the semaphore would make since, but with the CountDownLatch this is a blocking call, so it really doesn't. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes, i missed to remove it after adding latch. will fix it. |
||
}); | ||
latch.await(); | ||
if (ledgerDeleted.get()) { | ||
garbageCleaner.clean(ledgerId); | ||
} | ||
} | ||
|
||
private Set<Long> removeOverReplicatedledgers(Set<Long> bkActiveledgers, GarbageCleaner garbageCleaner) | ||
throws InterruptedException, KeeperException { | ||
Set<Long> overReplicatedLedgers = Sets.newHashSet(); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we need the second param exists?