Eviction scan fix #4173
Merged
Eviction scan fix #4173
Conversation
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
MonsieurNicolas
approved these changes
Jan 30, 2024
marta-lokhova
requested changes
Jan 30, 2024
src/bucket/Bucket.cpp
Outdated
| @@ -925,6 +927,10 @@ Bucket::scanForEviction(AbstractLedgerTxn& ltx, EvictionIterator& iter, | |||
| bytesToScan = 0; | |||
| return true; | |||
| } | |||
| else if (maxEntriesToEvict == 0) | |||
There was a problem hiding this comment.
nit: rename to remianingEntriesToEvict for clarity? (there's a comment in Buckets.h as well)
src/bucket/Bucket.cpp
Outdated
| if (isEmpty()) | ||
| if (isEmpty() || | ||
| protocolVersionIsBefore(getBucketVersion(shared_from_this()), | ||
| ProtocolVersion::V_20)) |
There was a problem hiding this comment.
nit: use SOROBAN_PROTOCOL_VERSION for clarity?
SirTyson
force-pushed
the
eviction-scan-fix
branch
from
27d30f4 to
b2038d5
Compare
|
r+ b2038d5 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Fixes a bug where more than
maxEntriesToEvictwould be evicted in a single ledger. Also adds an optimization where Buckets with protocol version < 20 are not scanned for eviction. This will improve eviction throughput in the short term after the initial upgrade.Checklist
clang-formatv8.0.0 (viamake formator the Visual Studio extension)