Enforce removeSegment flow with _enableDeletedKeysCompactionConsistency #13914
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #13914 +/- ##
============================================
- Coverage 61.75% 57.88% -3.87%
- Complexity 207 219 +12
============================================
Files 2436 2617 +181
Lines 133233 143455 +10222
Branches 20636 22026 +1390
============================================
+ Hits 82274 83044 +770
- Misses 44911 53908 +8997
- Partials 6048 6503 +455
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
tibrewalpratik17
force-pushed
the
fix_upsert_count_problem
branch
from
25b2d39 to
b2e3a63
Compare
klsince
reviewed
Sep 9, 2024
.../src/main/java/org/apache/pinot/segment/local/upsert/BasePartitionUpsertMetadataManager.java
Outdated
Show resolved
Hide resolved
klsince
reviewed
Sep 16, 2024
| // for full upsert, we are de-duping primary key once here to make sure that we are not adding | ||
| // primary-key multiple times and subtracting just once in removeSegment. | ||
| // for partial-upsert, we call this method in base class. | ||
| recordInfoIterator = resolveComparisonTies(recordInfoIterator, _hashFunction); |
klsince
approved these changes
Sep 16, 2024
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.
When we enable
_enableDeletedKeysCompactionConsistency, we want theremoveSegmentprocess to run to decrease thedistinctSegmentCountby 1. Previously, in issue #13347, it was assumed that during thereplaceSegmentoperation (whether during commit or refresh segment flow), theaddSegmentmethod would increase the count by 1, andremoveSegmentwould decrease it by 1. However, it’s not guaranteed that theremoveSegmentprocess will be triggered during thereplaceSegmentoperation.Here are the steps currently followed during replaceSegment in the
ConcurrentMapPartitionUpsertMetadataManagerclass:removeSegment(oldSegment, remainingValidDocIDsSnapshotNotReplaced)[Ref].During the destroy process of SegmentDataManager, the removeSegment(segment) method is called. However, this becomes a no-op since the segment has already been removed from _trackedSegments in step 3 [Ref].
For
_enableDeletedKeysCompactionConsistency, it’s crucial to ensure thatremoveSegment(segment)is called to maintain consistency in the distinctSegmentCount value. This change overrides the replaceSegment method in theConcurrentMapPartitionUpsertMetadataManagerForConsistentDeletesclass, ensuring that the removeSegment(segment) process is always executed at the end.Additionally, I updated the UTs to track the value of distinctSegmentCount, which was missed in #13347.
After deploying this change, I successfully tested that the
deletedttlkeysinmultiplesegmentsmetric decreased significantly, as shown in the screenshot below, indicating that the keys are now being deleted properly and consistently. Previously, the distinctSegmentCount was only increasing by 1 without decreasing, leading to the keys not being deleted as expected.