[fix] [broker] Delete topic timeout due to NPE #21595
Merged
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
poorbarcode
requested review from
Technoboy-,
codelipenghui,
gaoran10 and
mattisonchao
poorbarcode
added
type/bug
Technoboy-
approved these changes
Nov 20, 2023
AnonHxy
reviewed
Nov 21, 2023
| @@ -35,6 +37,7 @@ | |||
| import org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers; | |||
| import org.apache.pulsar.common.util.FutureUtil; | |||
|
|
|||
| @Slf4j | |||
| @@ -85,6 +88,9 @@ public DelayedDeliveryTracker newTracker(PersistentDispatcherMultipleConsumers d | |||
| */ | |||
| public CompletableFuture<Void> cleanResidualSnapshots(ManagedCursor cursor) { | |||
| Map<String, String> cursorProperties = cursor.getCursorProperties(); | |||
| if (MapUtils.isEmpty(cursorProperties)) { | |||
There was a problem hiding this comment.
I wonder which place introduce the null cursorProperties. And if so, should all the place check cursorProperties is empty or not:)?
There was a problem hiding this comment.
I wonder which place introduce the null cursorProperties. And if so, should all the place check cursorProperties is empty or not:)?
Good suggestion. Fixed
coderzc
approved these changes
Nov 21, 2023
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #21595 +/- ##
============================================
- Coverage 73.27% 73.26% -0.02%
- Complexity 32694 32703 +9
============================================
Files 1892 1892
Lines 140707 140682 -25
Branches 15483 15493 +10
============================================
- Hits 103098 103065 -33
- Misses 29496 29508 +12
+ Partials 8113 8109 -4
Flags with carried forward coverage won't be shown. Click here to find out more.
|
poorbarcode
added a commit
that referenced
this pull request
Nov 23, 2023
### Issue: There is an NPE that causes the Future of Delay message indexes bucket deletion to be no longer complete, which leads to the topic deletion timeout. You can reproduce this issue by the test `testDeletePartitionedTopicIfCursorPropsEmpty` and `testDeleteTopicIfCursorPropsEmpty` ### Modifications Fix the NPE. (cherry picked from commit b2f2b53)
poorbarcode
added a commit
that referenced
this pull request
Nov 23, 2023
### Issue: There is an NPE that causes the Future of Delay message indexes bucket deletion to be no longer complete, which leads to the topic deletion timeout. You can reproduce this issue by the test `testDeletePartitionedTopicIfCursorPropsEmpty` and `testDeleteTopicIfCursorPropsEmpty` ### Modifications Fix the NPE. (cherry picked from commit b2f2b53)
4 tasks
nikhil-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Dec 20, 2023
### Issue: There is an NPE that causes the Future of Delay message indexes bucket deletion to be no longer complete, which leads to the topic deletion timeout. You can reproduce this issue by the test `testDeletePartitionedTopicIfCursorPropsEmpty` and `testDeleteTopicIfCursorPropsEmpty` ### Modifications Fix the NPE. (cherry picked from commit b2f2b53)
srinath-ctds
pushed a commit
to datastax/pulsar
that referenced
this pull request
Dec 20, 2023
### Issue: There is an NPE that causes the Future of Delay message indexes bucket deletion to be no longer complete, which leads to the topic deletion timeout. You can reproduce this issue by the test `testDeletePartitionedTopicIfCursorPropsEmpty` and `testDeleteTopicIfCursorPropsEmpty` ### Modifications Fix the NPE. (cherry picked from commit b2f2b53)
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.
Motivation
Background:
BucketDelayedDeliveryTrackerFactorywas added with PIP-195: New bucket based delayed message trackerBucketDelayedDeliveryTrackerFactorywill be initialized if setting configsetDelayedDeliveryTrackerFactoryClassNametoBucketDelayedDeliveryTrackerFactoryIssue:
There is an NPE that causes the Future of Delay message indexes bucket deletion to be no longer complete, which leads to the topic deletion timeout. You can reproduce this issue by the test
testDeletePartitionedTopicIfCursorPropsEmptyandtestDeleteTopicIfCursorPropsEmptyIssue logs:
Modifications
Fix the NPE.
Documentation
docdoc-requireddoc-not-neededdoc-completeMatching PR in forked repository
PR in forked repository: x