IGNITE-29032 Improvement of the page eviction mechanism for in-memory - #13554
Open
wernerdv wants to merge 1 commit into
Open
IGNITE-29032 Improvement of the page eviction mechanism for in-memory#13554wernerdv wants to merge 1 commit into
wernerdv wants to merge 1 commit into
Conversation
Contributor
TCBot Test Analysis
Possible Blockers (0)No blockers found. New Tests (18)
|
wernerdv
changed the title
There was a problem hiding this comment.
🟡 Changes recommended
One or more issues must be addressed before approval.
Once you've addressed the issues Copilot identified, you can request another Copilot review.
Pull request overview
Improves in-memory page eviction to support large rows and avoid lock-ordering deadlocks.
Changes:
- Adds size-aware eviction for single and batch inserts.
- Introduces non-blocking eviction locking and progress guards.
- Expands eviction regression tests for both LRU modes.
File summaries
| File | Description |
|---|---|
| modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheEvictionSelfTestSuite.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/RandomLruPageEvictionWithExpiryPolicyTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/RandomLruPageEvictionSizeAwareTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/RandomLruPageEvictionConcurrentWritesTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/Random2LruPageEvictionWithExpiryPolicyTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/Random2LruPageEvictionSizeAwareTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/Random2LruPageEvictionConcurrentWritesTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionWithExpiryPolicyAbstractTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionSizeAwareAbstractTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionPutLargeObjectsAbstractTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionMetricTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionGuardOomTest.java | Updated as part of this pull request. |
| modules/core/src/test/java/org/apache/ignite/internal/processors/cache/eviction/paged/PageEvictionConcurrentWritesAbstractTest.java | Updated as part of this pull request. |
| modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/RowStore.java | Updated as part of this pull request. |
| modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/IgniteCacheDatabaseSharedManager.java | Updated as part of this pull request. |
| modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/evict/PageAbstractEvictionTracker.java | Updated as part of this pull request. |
| modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java | Updated as part of this pull request. |
| modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java | Updated as part of this pull request. |
| modules/core/src/main/java/org/apache/ignite/configuration/DataRegionConfiguration.java | Updated as part of this pull request. |
Review details
- Files reviewed: 19/19 changed files
- Comments generated: 11
- Review effort level: Balanced
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+4217
to
+4218
| if (tryLock) | ||
| return tryLockEntry(ENTRY_LOCK_TIMEOUT); |
Comment on lines
+1318
to
+1322
| else if (curAvailable < bestAvailable) { | ||
| // A transient drop caused by concurrent activity: keep the best value, do not penalize. | ||
| } | ||
| else | ||
| attemptsWithoutProgress++; |
| * @throws Exception If failed. | ||
| */ | ||
| @Test(timeout = 180_000) | ||
| @WithSystemProperty(key = "ENTRY_LOCK_TIMEOUT", value = "1") |
Comment on lines
+162
to
+164
| assertTrue("Timed out waiting for entries to be locked", ready.await(60, TimeUnit.SECONDS)); | ||
|
|
||
| assertNull("Unexpected error while locking entries: " + lockerErr.get(), lockerErr.get()); |
Comment on lines
+1274
to
+1275
| // Pages required to place the row (rounded up) plus a margin for the page header and fragmentation. | ||
| long requiredPages = (dataRowSize + pageSize - 1) / pageSize + 1; |
Comment on lines
+143
to
+149
| int maxRowSize = 0; | ||
|
|
||
| for (CacheDataRow row : rows) | ||
| maxRowSize = Math.max(maxRowSize, row.size()); | ||
|
|
||
| if (maxRowSize > 0) | ||
| ctx.database().ensureFreeSpaceForInsert(grp.dataRegion(), maxRowSize); |
Comment on lines
+160
to
+163
| catch (Exception e) { | ||
| // OOM (possibly wrapped) because the row cannot fit into the region. | ||
| rejected = true; | ||
| } |
Comment on lines
+180
to
+184
| // Pre-fill with small evictable entries so large rows below region capacity fit via the reserve path. | ||
| byte[] small = new byte[SMALL_RECORD_SIZE]; | ||
|
|
||
| for (int i = 0; i < SMALL_ENTRIES; i++) | ||
| cache.put(SMALL_ENTRIES + i, small); |
Comment on lines
+211
to
+217
| cache.put(1, new byte[1024]); | ||
|
|
||
| byte[] big = new byte[RECORD_SIZE]; | ||
|
|
||
| Arrays.fill(big, (byte)7); | ||
|
|
||
| cache.put(1, big); |
Comment on lines
+126
to
+130
| // Fill the region up to its capacity with short-TTL large records. | ||
| Object val = new byte[RECORD_SIZE]; | ||
|
|
||
| for (int i = 0; i < 10; i++) | ||
| cache.put(i, val); |
This file contains hidden or 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
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.
Thank you for submitting the pull request to the Apache Ignite.
In order to streamline the review of the contribution
we ask you to ensure the following steps have been taken:
The Contribution Checklist
The description explains WHAT and WHY was made instead of HOW.
The following pattern must be used:
IGNITE-XXXX Change summarywhereXXXX- number of JIRA issue.(see the Maintainers list)
the
green visaattached to the JIRA ticket (see tabPR Checkat TC.Bot - Instance 1 or TC.Bot - Instance 2)Notes
If you need any help, please email dev@ignite.apache.org or ask anу advice on http://asf.slack.com #ignite channel.