[fix][broker] Closed topics won't be removed from the cache by shibd · Pull Request #23884 · apache/pulsar

shibd · 2025-01-23T09:12:06Z

Motivation

When transaction component init fails, it will try to close the topic, but maybe not remove topic from cache.

time	thread `createTransactionBufferSystemTopicClient`	thread `create topic`
1		topic ledger open complete and new PersistentTopic object
2		new TransactionBuffer
3		Try get AbortedTxnProcessor
4	`Failed to create snapshot writer` and close topic
5	set topic fenced and closing
6	try remove topic from broker cache, since the topic feature is not done, will ignore it
7		Topic future success complete

Modifications

Add topic create future to topic.
When remove a topic, call removeTopicFutureFromCache and passed topic future.
Remove method removeTopicFromCache(Topic) that intrudce from [fix][broker]Consumer can't consume messages because there has two sames topics in one broker #17526
- At that time, there could have been two topicFutures for the same topic simultaneously (one creating, one closing). However, this case no longer occurs because we fixed it in #22860, ensuring that a topic cannot be removed until it is fully created or closed.

Verifying this change

You can run testNoOrphanClosedTopicIfTxnInternalFailed to reproduce this.

Documentation

doc
doc-required
doc-not-needed
doc-complete

Test PR

shibd#53

codecov-commenter · 2025-01-23T10:26:09Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.22%. Comparing base (bbc6224) to head (c61c192).
Report is 878 commits behind head on master.

Additional details and impacted files

@@             Coverage Diff              @@
##             master   #23884      +/-   ##
============================================
+ Coverage     73.57%   74.22%   +0.65%     
+ Complexity    32624    32254     -370     
============================================
  Files          1877     1853      -24     
  Lines        139502   143726    +4224     
  Branches      15299    16333    +1034     
============================================
+ Hits         102638   106685    +4047     
+ Misses        28908    28640     -268     
- Partials       7956     8401     +445

Flag	Coverage Δ
inttests	`26.72% <71.42%> (+2.14%)`	⬆️
systests	`23.25% <21.42%> (-1.08%)`	⬇️
unittests	`73.74% <100.00%> (+0.90%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
...rg/apache/pulsar/broker/service/AbstractTopic.java	`87.77% <ø> (-0.22%)`	⬇️
...rg/apache/pulsar/broker/service/BrokerService.java	`84.97% <100.00%> (+4.19%)`	⬆️
...ransaction/buffer/impl/TopicTransactionBuffer.java	`85.75% <100.00%> (-2.00%)`	⬇️

... and 1029 files with indirect coverage changes

lhotari

Please reduce code duplication

.../org/apache/pulsar/broker/transaction/buffer/impl/SingleSnapshotAbortedTxnProcessorImpl.java

...st/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionPersistentTopicTest.java

.../org/apache/pulsar/broker/transaction/buffer/impl/SingleSnapshotAbortedTxnProcessorImpl.java

...r/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java

shibd · 2025-01-24T10:07:57Z

hi, @lhotari @BewareMyPower @dao-jun Thanks for details review,

After discussing with @poorbarcode , we've decided to pass createFuture into the topic and call topic.remove(topic, topicFuture) to direct remove it, I'll push a new version later.

shibd · 2025-01-26T02:20:05Z

/pulsarbot rerun-failure-checks

RobertIndie

Overall looks good to me. Thanks.

...st/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionPersistentTopicTest.java

...r/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java

lhotari

Please check the review comments.

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java

lhotari

Please check comment about the comment.

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java

lhotari

LGTM

(cherry picked from commit 8a40b30)

…3884) (cherry picked from commit 8a40b30)

…3884)

…3884) (cherry picked from commit 8a40b30) (cherry picked from commit 5d35d41)

shibd added type/bug The PR fixed a bug or issue reported a bug ready-to-test release/3.0.10 release/3.3.5 release/4.0.3 labels Jan 23, 2025

shibd requested review from Technoboy-, congbobo184, gaoran10, liangyepianzhou and poorbarcode January 23, 2025 09:12

shibd self-assigned this Jan 23, 2025

github-actions bot added the doc-not-needed Your PR changes do not impact docs label Jan 23, 2025

lhotari requested changes Jan 23, 2025

View reviewed changes

.../org/apache/pulsar/broker/transaction/buffer/impl/SingleSnapshotAbortedTxnProcessorImpl.java Outdated Show resolved Hide resolved

BewareMyPower requested changes Jan 23, 2025

View reviewed changes

...st/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionPersistentTopicTest.java Outdated Show resolved Hide resolved

BewareMyPower reviewed Jan 23, 2025

View reviewed changes

BewareMyPower requested changes Jan 23, 2025

View reviewed changes

...r/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java Show resolved Hide resolved

shibd marked this pull request as draft January 24, 2025 10:08

[fix][broker] Closed topics won't be removed from the cache

6cdf378

shibd force-pushed the fix_txn_topic_stuck branch from 85302cb to 6cdf378 Compare January 26, 2025 02:10

shibd marked this pull request as ready for review January 26, 2025 02:17

shibd requested review from BewareMyPower, dao-jun and lhotari January 26, 2025 02:17

poorbarcode approved these changes Jan 26, 2025

View reviewed changes

RobertIndie reviewed Jan 26, 2025

View reviewed changes

...st/java/org/apache/pulsar/broker/transaction/buffer/impl/TransactionPersistentTopicTest.java Outdated Show resolved Hide resolved

...r/src/main/java/org/apache/pulsar/broker/transaction/buffer/impl/TopicTransactionBuffer.java Show resolved Hide resolved

change annotation

255aa71

shibd requested a review from RobertIndie January 26, 2025 11:18

BewareMyPower approved these changes Jan 27, 2025

View reviewed changes

lhotari requested changes Jan 27, 2025

View reviewed changes

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java Show resolved Hide resolved

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/BrokerService.java Outdated Show resolved Hide resolved

Address code review

1752721

shibd requested a review from lhotari February 4, 2025 09:36

Remove useless change

c61c192

lhotari requested changes Feb 5, 2025

View reviewed changes

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/AbstractTopic.java Show resolved Hide resolved

Address comment

3401270

shibd requested a review from lhotari February 5, 2025 14:15

lhotari approved these changes Feb 5, 2025

View reviewed changes

shibd merged commit 8a40b30 into apache:master Feb 6, 2025
51 of 52 checks passed

shibd added a commit that referenced this pull request Feb 6, 2025

[fix][broker] Closed topics won't be removed from the cache (#23884)

5d35d41

(cherry picked from commit 8a40b30)

shibd added a commit that referenced this pull request Feb 6, 2025

[fix][broker] Closed topics won't be removed from the cache (#23884)

e1d8c7d

(cherry picked from commit 8a40b30)

shibd added a commit that referenced this pull request Feb 6, 2025

[fix][broker] Closed topics won't be removed from the cache (#23884)

ccf7284

(cherry picked from commit 8a40b30)

shibd added cherry-picked/branch-3.0 cherry-picked/branch-3.3 cherry-picked/branch-4.0 labels Feb 6, 2025

nodece pushed a commit to ascentstream/pulsar that referenced this pull request Feb 10, 2025

[fix][broker] Closed topics won't be removed from the cache (apache#2…

8ec413a

…3884) (cherry picked from commit 8a40b30)

hanmz pushed a commit to hanmz/pulsar that referenced this pull request Feb 12, 2025

[fix][broker] Closed topics won't be removed from the cache (apache#2…

564601a

…3884)

nikhil-ctds pushed a commit to datastax/pulsar that referenced this pull request Feb 19, 2025

[fix][broker] Closed topics won't be removed from the cache (apache#2…

78b843d

…3884) (cherry picked from commit 8a40b30) (cherry picked from commit 5d35d41)

srinath-ctds pushed a commit to datastax/pulsar that referenced this pull request Feb 24, 2025

[fix][broker] Closed topics won't be removed from the cache (apache#2…

86f1982

…3884) (cherry picked from commit 8a40b30) (cherry picked from commit 5d35d41)

BewareMyPower mentioned this pull request Jul 10, 2025

[fix][broker] Fix failed topic future not removed before the deduplication recovery is done #24500

Closed

4 tasks

Conversation

shibd commented Jan 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Motivation

Modifications

Verifying this change

Documentation

Test PR

Uh oh!

codecov-commenter commented Jan 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

lhotari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shibd commented Jan 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shibd commented Jan 26, 2025

Uh oh!

RobertIndie left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

lhotari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

lhotari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lhotari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

shibd commented Jan 23, 2025 •

edited

Loading

codecov-commenter commented Jan 23, 2025 •

edited

Loading

shibd commented Jan 24, 2025 •

edited

Loading