-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[improve][offloaders] Automatically evict Offloaded Ledgers from memory #19783
Open
eolivelli
wants to merge
8
commits into
apache:master
Choose a base branch
from
eolivelli:impl/offloaders-evict-memory
base: master
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 3 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
fd75178
[improve][offloaders] Automatically evict Offloaded Ledgers from memory
eolivelli a7933f0
style
eolivelli a04ca72
fix license
eolivelli d76ae68
Merge remote-tracking branch 'origin/master' into impl/offloaders-evi…
lhotari 85f3eb5
Rename setter
lhotari c629209
Make lastAccessTimestamp volatile to prevent stale values
lhotari 0a3bb3f
Prevent concurrent runs for eviction, add minimum eviction interval
lhotari 0315714
Fix test
lhotari 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
29 changes: 29 additions & 0 deletions
29
managed-ledger/src/main/java/org/apache/bookkeeper/mledger/OffloadedLedgerHandle.java
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 |
---|---|---|
@@ -0,0 +1,29 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.bookkeeper.mledger; | ||
|
||
/** | ||
* This is a marked interface for ledger handle that represent offloaded data. | ||
*/ | ||
public interface OffloadedLedgerHandle { | ||
|
||
default long lastAccessTimestamp() { | ||
return -1; | ||
} | ||
} |
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
103 changes: 103 additions & 0 deletions
103
...edger/src/test/java/org/apache/bookkeeper/mledger/impl/OffloadEvictUnusedLedgersTest.java
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 |
---|---|---|
@@ -0,0 +1,103 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.bookkeeper.mledger.impl; | ||
|
||
import static org.testng.Assert.assertEquals; | ||
import static org.testng.Assert.assertNotEquals; | ||
import static org.testng.Assert.assertTrue; | ||
|
||
import org.apache.bookkeeper.mledger.Entry; | ||
import org.apache.bookkeeper.mledger.ManagedCursor; | ||
import org.apache.bookkeeper.mledger.ManagedLedgerConfig; | ||
import org.apache.bookkeeper.test.MockedBookKeeperTestCase; | ||
import org.slf4j.Logger; | ||
import org.slf4j.LoggerFactory; | ||
import org.testng.annotations.Test; | ||
import java.util.List; | ||
import java.util.concurrent.TimeUnit; | ||
import java.util.concurrent.atomic.AtomicLong; | ||
import java.util.stream.Collectors; | ||
|
||
public class OffloadEvictUnusedLedgersTest extends MockedBookKeeperTestCase { | ||
private static final Logger log = LoggerFactory.getLogger(OffloadEvictUnusedLedgersTest.class); | ||
|
||
@Test | ||
public void testEvictUnusedLedgers() throws Exception { | ||
OffloadPrefixReadTest.MockLedgerOffloader offloader = | ||
new OffloadPrefixReadTest.MockLedgerOffloader(); | ||
ManagedLedgerConfig config = new ManagedLedgerConfig(); | ||
config.setMaxEntriesPerLedger(10); | ||
config.setMinimumRolloverTime(0, TimeUnit.SECONDS); | ||
config.setRetentionTime(10, TimeUnit.MINUTES); | ||
config.setRetentionSizeInMB(10); | ||
int inactiveOffloadedLedgerEvictionTimeMs = 10000; | ||
config.setInactiveOffloadedLedgerEvictionTimeMs(inactiveOffloadedLedgerEvictionTimeMs, TimeUnit.MILLISECONDS); | ||
config.setLedgerOffloader(offloader); | ||
ManagedLedgerImpl ledger = (ManagedLedgerImpl)factory.open("my_test_ledger_evict", config); | ||
|
||
// no evict when no offloaded ledgers | ||
assertTrue(ledger.internalEvictOffloadedLedgers().isEmpty()); | ||
|
||
int i = 0; | ||
for (; i < 25; i++) { | ||
String content = "entry-" + i; | ||
ledger.addEntry(content.getBytes()); | ||
} | ||
assertEquals(ledger.getLedgersInfoAsList().size(), 3); | ||
|
||
ledger.offloadPrefix(ledger.getLastConfirmedEntry()); | ||
|
||
assertEquals(ledger.getLedgersInfoAsList().size(), 3); | ||
assertEquals(ledger.getLedgersInfoAsList().stream() | ||
.filter(e -> e.getOffloadContext().getComplete()) | ||
.map(e -> e.getLedgerId()).collect(Collectors.toSet()), | ||
offloader.offloadedLedgers()); | ||
|
||
// ledgers should be marked as offloaded | ||
ledger.getLedgersInfoAsList().stream().allMatch(l -> l.hasOffloadContext()); | ||
|
||
// no evict when no offloaded ledgers are marked as inactive | ||
assertTrue(ledger.internalEvictOffloadedLedgers().isEmpty()); | ||
|
||
ManagedCursor cursor = ledger.newNonDurableCursor(PositionImpl.EARLIEST); | ||
int j = 0; | ||
for (Entry e : cursor.readEntries(25)) { | ||
assertEquals(new String(e.getData()), "entry-" + j++); | ||
} | ||
cursor.close(); | ||
|
||
// set last access time to be 2x inactiveOffloadedLedgerEvictionTimeMs | ||
AtomicLong first = new AtomicLong(-1); | ||
assertTrue(!ledger.ledgerCache.isEmpty()); | ||
ledger.ledgerCache.forEach((id, l) -> { | ||
if (first.compareAndSet(-1, id)) { | ||
OffloadPrefixReadTest.MockOffloadReadHandle handle = | ||
(OffloadPrefixReadTest.MockOffloadReadHandle) l.join(); | ||
handle.setLastAccessTimestamp(System.currentTimeMillis() - inactiveOffloadedLedgerEvictionTimeMs * 2); | ||
} | ||
}); | ||
assertNotEquals(first.get(), -1L); | ||
|
||
List<Long> evicted = ledger.internalEvictOffloadedLedgers(); | ||
assertEquals(evicted.size(), 1); | ||
assertEquals(first.get(), evicted.get(0).longValue()); | ||
|
||
} | ||
|
||
} |
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
Oops, something went wrong.
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.
I don't see
internalEvictOffloadedLedgers
being called anywhere but tests, could you explain how it will be triggered?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.
@poorbarcode It gets called when
internalTrimLedgers
is called.