[fix][broker] Fix delete system topic clean topic policy #18823

liangyepianzhou · 2022-12-08T13:17:12Z

Motivation

If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted.

Modification

Only change_events topic do not need to clear topic policies.

Verifying this change

Make sure that the change passes the CI checks.

(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:)

Added integration tests for end-to-end deployment with large payloads (10MB)
Extended integration test for recovery after broker failure

Does this pull request potentially affect one of the following parts:

If the box was checked, please highlight the changes

Documentation

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

Matching PR in forked repository

PR in forked repository: liangyepianzhou#16

### Motivation If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. ### Modification Only change_events topic do not need to clear topic policies.

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java

pulsar-broker/src/main/java/org/apache/pulsar/broker/service/persistent/PersistentTopic.java

pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java

…/fix_clear_topic_policy

codecov-commenter · 2022-12-09T06:00:36Z

Codecov Report

Merging #18823 (82d5817) into master (da87e40) will increase coverage by 2.98%.
The diff coverage is 70.00%.

@@             Coverage Diff              @@
##             master   #18823      +/-   ##
============================================
+ Coverage     46.42%   49.41%   +2.98%     
- Complexity    10437    10853     +416     
============================================
  Files           703      703              
  Lines         68816    68828      +12     
  Branches       7377     7377              
============================================
+ Hits          31950    34011    +2061     
+ Misses        33252    31131    -2121     
- Partials       3614     3686      +72

Flag	Coverage Δ
unittests	`49.41% <70.00%> (+2.98%)`	⬆️

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

Impacted Files	Coverage Δ
...ache/pulsar/broker/loadbalance/LinuxInfoUtils.java	`33.72% <0.00%> (+5.81%)`	⬆️
...ker/resourcegroup/ResourceQuotaCalculatorImpl.java	`4.16% <0.00%> (ø)`
...pache/pulsar/broker/admin/impl/NamespacesBase.java	`64.44% <83.33%> (+1.39%)`	⬆️
...ker/loadbalance/impl/LinuxBrokerHostUsageImpl.java	`79.68% <100.00%> (+0.32%)`	⬆️
.../service/SystemTopicBasedTopicPoliciesService.java	`72.56% <100.00%> (+8.14%)`	⬆️
...sar/broker/service/persistent/PersistentTopic.java	`61.88% <100.00%> (+0.48%)`	⬆️
.../pulsar/broker/service/SharedConsumerAssignor.java	`3.70% <0.00%> (-74.08%)`	⬇️
...apache/pulsar/broker/service/EntryAndMetadata.java	`0.00% <0.00%> (-40.75%)`	⬇️
...ersistentStickyKeyDispatcherMultipleConsumers.java	`47.05% <0.00%> (-13.73%)`	⬇️
...ervice/persistent/MessageRedeliveryController.java	`56.09% <0.00%> (-9.76%)`	⬇️
... and 118 more

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java

poorbarcode · 2022-12-09T06:14:26Z

Link to

[fix][broker] Fix can not delete namespace by force #18307

If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. Only change_events topic do not need to clear topic policies. (cherry picked from commit 93c41de)

…18823) (#18831) cherry-pick #18823 ### Motivation If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. ### Modification Only change_events topic do not need to clear topic policies. ### Matching PR in forked repository PR in forked repository: liangyepianzhou#16

### Motivation If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. ### Modification Only change_events topic do not need to clear topic policies.

If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. Only change_events topic do not need to clear topic policies. (cherry picked from commit 93c41de) (cherry picked from commit 5ca889f)

### Motivation If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. ### Modification Only change_events topic do not need to clear topic policies.

If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. Only change_events topic do not need to clear topic policies. (cherry picked from commit 93c41de) (cherry picked from commit 5ca889f)

Motivation: After PR #18823, The cmd delete topic will fail if disabled the feature system topic. Modifications: do not delete the system policy if disabled the feature system topic

If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. Only change_events topic do not need to clear topic policies. (cherry picked from commit 93c41de)

Technoboy- · 2023-03-16T11:51:35Z

Cherry-picked by #19835

…9835) Co-authored-by: Jiwe Guo <technoboy@apache.org>

Motivation: After PR #18823, The cmd delete topic will fail if disabled the feature system topic. Modifications: do not delete the system policy if disabled the feature system topic (cherry picked from commit 401fb05)

[fix][broker] Fix delete system topic clean topic policy

5024d26

### Motivation If users set topic policy for system topic, then delete this system topic, the topic policy should be deleted. ### Modification Only change_events topic do not need to clear topic policies.

liangyepianzhou requested review from eolivelli, codelipenghui, congbobo184 and Technoboy- December 8, 2022 13:17

github-actions bot added the doc-not-needed Your PR changes do not impact docs label Dec 8, 2022

congbobo184 requested a review from gaoran10 December 9, 2022 01:56

congbobo184 assigned liangyepianzhou Dec 9, 2022

congbobo184 added this to the 2.12.0 milestone Dec 9, 2022

congbobo184 added release/2.11.0 release/2.9.4 release/2.10.3 labels Dec 9, 2022

congbobo184 reviewed Dec 9, 2022

View reviewed changes

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java Show resolved Hide resolved

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

fix

c9d9c94

congbobo184 reviewed Dec 9, 2022

View reviewed changes

pulsar-broker/src/test/java/org/apache/pulsar/broker/transaction/TransactionTest.java Outdated Show resolved Hide resolved

move test

7b4ac72

congbobo184 added the area/broker label Dec 9, 2022

liangyepianzhou added 2 commits December 9, 2022 12:42

Merge remote-tracking branch 'apache/master' into xiangying/fix/topic…

a5a0ad4

…/fix_clear_topic_policy

adjust test

e623d19

liangyepianzhou added the ready-to-test label Dec 9, 2022

unused imported

82d5817

congbobo184 approved these changes Dec 9, 2022

View reviewed changes

poorbarcode approved these changes Dec 9, 2022

View reviewed changes

pulsar-broker/src/main/java/org/apache/pulsar/broker/admin/impl/NamespacesBase.java Show resolved Hide resolved

codelipenghui approved these changes Dec 9, 2022

View reviewed changes

Technoboy- added release/2.11.1 and removed release/2.11.0 labels Dec 9, 2022

congbobo184 merged commit 93c41de into apache:master Dec 9, 2022

congbobo184 mentioned this pull request Dec 9, 2022

[cherry-pick][branch-2.9] Fix delete system topic clean topic policy (#18823) #18831

Merged

liangyepianzhou mentioned this pull request Dec 9, 2022

[cherry-pick][branch-2.11] cherry-pick fixing can not delete namespace by force (#18307) #18826

Merged

14 tasks

liangyepianzhou added the cherry-picked/branch-2.10 label Dec 9, 2022

congbobo184 added the cherry-picked/branch-2.9 Archived: 2.9 is end of life label Dec 10, 2022

congbobo184 mentioned this pull request Dec 10, 2022

[cherry-pick][branch-2.10] fix code style and run test #18863

Merged

3 tasks

poorbarcode mentioned this pull request Mar 7, 2023

[fix] [broker] delete topic failed if disabled system topic #19735

Merged

4 tasks

liangyepianzhou mentioned this pull request Mar 16, 2023

[cherry-pick][branch-2.11]Cherry-pick three PR to branch-2.11 #19833

Closed

15 tasks

Technoboy- added the cherry-picked/branch-2.11 label Mar 16, 2023

Technoboy- mentioned this pull request Mar 20, 2023

[fix][branch-2.11] Fix delete system topic clean topic policy (#18823) #19835

Merged

15 tasks

Technoboy- added a commit that referenced this pull request Mar 20, 2023

[fix][broker] Fix delete system topic clean topic policy (#18823) (#1…

5eb0ce2

…9835) Co-authored-by: Jiwe Guo <technoboy@apache.org>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[fix][broker] Fix delete system topic clean topic policy #18823

[fix][broker] Fix delete system topic clean topic policy #18823

liangyepianzhou commented Dec 8, 2022

codecov-commenter commented Dec 9, 2022 •

edited

poorbarcode commented Dec 9, 2022

Technoboy- commented Mar 16, 2023

[fix][broker] Fix delete system topic clean topic policy #18823

[fix][broker] Fix delete system topic clean topic policy #18823

Conversation

liangyepianzhou commented Dec 8, 2022

Motivation

Modification

Verifying this change

Does this pull request potentially affect one of the following parts:

Documentation

Matching PR in forked repository

codecov-commenter commented Dec 9, 2022 • edited

Codecov Report

poorbarcode commented Dec 9, 2022

Technoboy- commented Mar 16, 2023

codecov-commenter commented Dec 9, 2022 •

edited