Repository navigation
[To dev/1.3] Preserve query memory registrations during stale fragment cleanup - #18840
Merged
Merged
Conversation
(cherry picked from commit b0b96f6)
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## dev/1.3 #18840 +/- ##
=============================================
+ Coverage 45.40% 45.43% +0.02%
Complexity 198 198
=============================================
Files 3667 3667
Lines 251095 251096 +1
Branches 31088 31089 +1
=============================================
+ Hits 114013 114076 +63
+ Misses 137082 137020 -62 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
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.
Description
Backport #18834 to
dev/1.3(cherry-picked from b0b96f6).A delayed fragment cleanup can delete a replacement query-memory registration, causing
MemoryPool.free()to fail when buffered results are consumed. Check that the outer entry still references the map being cleaned up before removing it, under the existing registration lock.Preserve all five regression tests from the original PR, including the deterministic concurrent cleanup test. The only backport adaptation is resolving the test import difference with
dev/1.3.Validation
MemoryPoolTest(27 tests),SharedTsBlockQueueTest(2 tests); no failures, errors, or skips.mvn clean test -pl iotdb-core/datanode -am \ -Dtest=MemoryPoolTest,SharedTsBlockQueueTest \ -Dsurefire.failIfNoSpecifiedTests=false -DfailIfNoTests=falsegit diff --checkpassed.Checklist
Key changed classes
MemoryPoolMemoryPoolTest