coderzc commented on code in PR #19138:
URL: https://github.com/apache/pulsar/pull/19138#discussion_r1071326907
##########
pulsar-broker/src/main/java/org/apache/pulsar/broker/delayed/bucket/BucketDelayedDeliveryTracker.java:
##########
@@ -243,6 +263,53 @@ public synchronized boolean addMessage(long ledgerId, long
entryId, long deliver
return true;
}
+ private synchronized CompletableFuture<Void> asyncMergeBucketSnapshot() {
+ List<ImmutableBucket> values =
immutableBuckets.asMapOfRanges().values().stream().toList();
+ long minNumberMessages = Long.MAX_VALUE;
+ int minIndex = -1;
+ for (int i = 0; i + 1 < values.size(); i++) {
+ ImmutableBucket bucketL = values.get(i);
+ ImmutableBucket bucketR = values.get(i + 1);
+ long numberMessages = bucketL.numberBucketDelayedMessages +
bucketR.numberBucketDelayedMessages;
+ if (numberMessages < minNumberMessages) {
+ minNumberMessages = (int) numberMessages;
+ minIndex = i;
+ }
+ }
+ return asyncMergeBucketSnapshot(values.get(minIndex),
values.get(minIndex + 1));
+ }
+
+ private synchronized CompletableFuture<Void>
asyncMergeBucketSnapshot(ImmutableBucket bucketA,
+
ImmutableBucket bucketB) {
+ immutableBuckets.remove(Range.closed(bucketA.startLedgerId,
bucketA.endLedgerId));
+ immutableBuckets.remove(Range.closed(bucketB.startLedgerId,
bucketB.endLedgerId));
+
+ CompletableFuture<Long> snapshotCreateFutureA =
+
bucketA.getSnapshotCreateFuture().orElse(CompletableFuture.completedFuture(null));
+ CompletableFuture<Long> snapshotCreateFutureB =
+
bucketB.getSnapshotCreateFuture().orElse(CompletableFuture.completedFuture(null));
+
+ return CompletableFuture.allOf(snapshotCreateFutureA,
snapshotCreateFutureB).thenCompose(__ -> {
+
CompletableFuture<List<DelayedMessageIndexBucketSnapshotFormat.SnapshotSegment>>
futureA =
+ bucketA.getRemainSnapshotSegment();
+
CompletableFuture<List<DelayedMessageIndexBucketSnapshotFormat.SnapshotSegment>>
futureB =
+ bucketB.getRemainSnapshotSegment();
+ return futureA.thenCombine(futureB,
CombinedSegmentDelayedIndexQueue::wrap)
+ .thenCompose(combinedDelayedIndexQueue -> {
+ CompletableFuture<Void> removeAFuture =
bucketA.asyncDeleteBucketSnapshot();
+ CompletableFuture<Void> removeBFuture =
bucketB.asyncDeleteBucketSnapshot();
+
+ return CompletableFuture.allOf(removeAFuture,
removeBFuture).thenRun(() -> {
Review Comment:
I use a way to clean up the old overlap buckets when recovering buckets, so
that we can persist the newly merged bucket first, then delete the original
bucket.
The approach is as follows:
If there is range `[1...10]`、`[30...40]`、`[1...40]`, then it will only
remain `[1...40]`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
