[fix][broker] Wait for orphan schema ledger cleanup before retry#25579
Merged
Conversation
11 tasks
Contributor
Author
codelipenghui
approved these changes
Apr 25, 2026
poorbarcode
pushed a commit
to poorbarcode/pulsar
that referenced
this pull request
May 6, 2026
Technoboy-
pushed a commit
that referenced
this pull request
May 12, 2026
lhotari
pushed a commit
that referenced
this pull request
May 13, 2026
nodece
pushed a commit
to ascentstream/pulsar
that referenced
this pull request
May 27, 2026
priyanshu-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Jun 9, 2026
…che#25579) (cherry picked from commit 08555f0)
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.
Fixes #xyz
Main Issue: #25514
PIP: #xyz
Motivation
PR #25514 added orphan schema ledger cleanup when concurrent schema creation loses the schema locator CAS race. However, the cleanup used callback-style
asyncDeleteLedgerinsidewhenComplete, so the schema storage retry could continue before the BookKeeper delete callback completed.This makes the no-orphan-ledger assertion timing-sensitive and weakens the cleanup guarantee exposed by schema creation. This PR waits for the orphan ledger delete callback before preserving the original CAS exception and letting the existing retry flow continue.
Modifications
deleteLedgerAsynchelper inBookkeeperSchemaStorageto wrapbookKeeper.asyncDeleteLedgerwith aCompletableFuture.AlreadyExistsExceptionorBadVersionException.Verifying this change
(Please pick either of the following options)
This change is a trivial rework / code cleanup without any test coverage.
(or)
This change is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(example:)
Does this pull request potentially affect one of the following parts:
If the box was checked, please highlight the changes
Matching PR in forked repository
PR in forked repository: Denovo1998#27