[Issue 9790] Support disabled the tenants/namespaces force deletion in the broker.conf #9819
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
| @@ -290,6 +290,12 @@ protected void internalDeleteTenant(AsyncResponse asyncResponse, String tenant) | |||
| } | |||
|
|
|||
| protected void internalDeleteTenantForcefully(AsyncResponse asyncResponse, String tenant) { | |||
| if (!pulsar().getConfiguration().isForceDeleteTenantAllowed()) { | |||
| asyncResponse.resume( | |||
| new RestException(Status.FORBIDDEN, "Broker doesn't allow forced deletion of tenants")); | |||
There was a problem hiding this comment.
The @ApiReponse use 403 to indicate if the request has admin permission, I think 405 is more reasonable here?
There was a problem hiding this comment.
Thanks for the tips, done.
codelipenghui
approved these changes
Mar 8, 2021
codelipenghui
requested review from
sijie,
merlimat,
315157973,
hangc0276,
jiazhai and
zymap
|
/pulsarbot run-failure-checks |
sijie
approved these changes
Mar 8, 2021
sijie
added
doc-required
|
@murong00 thanks for your great work! Shall the changes be documented to the broker -configuration section? |
|
@Anonymitaet Added the docs accordingly, please help to take a look when you are available. |
Anonymitaet
reviewed
Mar 9, 2021
| @@ -185,6 +185,8 @@ internalListenerName|Specify the internal listener name for the broker.<br><br>* | |||
| |brokerDeleteInactiveTopicsFrequencySeconds| How often to check for inactive topics |60| | |||
| | brokerDeleteInactiveTopicsMode | Set the mode to delete inactive topics. <li> `delete_when_no_subscriptions`: delete the topic which has no subscriptions or active producers. <li> `delete_when_subscriptions_caught_up`: delete the topic whose subscriptions have no backlogs and which has no active producers or consumers. | `delete_when_no_subscriptions` | | |||
| | brokerDeleteInactiveTopicsMaxInactiveDurationSeconds | Set the maximum duration for inactive topics. If it is not specified, the `brokerDeleteInactiveTopicsFrequencySeconds` parameter is adopted. | N/A | | |||
| |forceDeleteTenantAllowed| Allow forced deletion of tenants.|false| | |||
There was a problem hiding this comment.
Suggested change
| |forceDeleteTenantAllowed| Allow forced deletion of tenants.|false| | |
| |forceDeleteTenantAllowed| Allow you to delete a tenant forcefully. |false| |
conf/broker.conf
Outdated
| @@ -165,6 +165,12 @@ brokerDeleteInactivePartitionedTopicMetadataEnabled=false | |||
| # Topics that are inactive for longer than this value will be deleted | |||
| brokerDeleteInactiveTopicsMaxInactiveDurationSeconds= | |||
|
|
|||
| # Allow forced deletion of tenants. | |||
There was a problem hiding this comment.
Suggested change
| # Allow forced deletion of tenants. | |
| # Allow you to delete a tenant forcefully. |
conf/broker.conf
Outdated
| # Allow forced deletion of tenants. | ||
| forceDeleteTenantAllowed=false | ||
|
|
||
| # Allow forced deletion of namespaces. |
There was a problem hiding this comment.
Suggested change
| # Allow forced deletion of namespaces. | |
| # Allow you to delete a namespace forcefully. |
| @@ -185,6 +185,8 @@ internalListenerName|Specify the internal listener name for the broker.<br><br>* | |||
| |brokerDeleteInactiveTopicsFrequencySeconds| How often to check for inactive topics |60| | |||
| | brokerDeleteInactiveTopicsMode | Set the mode to delete inactive topics. <li> `delete_when_no_subscriptions`: delete the topic which has no subscriptions or active producers. <li> `delete_when_subscriptions_caught_up`: delete the topic whose subscriptions have no backlogs and which has no active producers or consumers. | `delete_when_no_subscriptions` | | |||
| | brokerDeleteInactiveTopicsMaxInactiveDurationSeconds | Set the maximum duration for inactive topics. If it is not specified, the `brokerDeleteInactiveTopicsFrequencySeconds` parameter is adopted. | N/A | | |||
| |forceDeleteTenantAllowed| Allow forced deletion of tenants.|false| | |||
| |forceDeleteNamespaceAllowed| Allow forced deletion of namespaces.|false| | |||
There was a problem hiding this comment.
Suggested change
| |forceDeleteNamespaceAllowed| Allow forced deletion of namespaces.|false| | |
| |forceDeleteNamespaceAllowed| Allow you to delete a namespace forcefully. |false| |
Anonymitaet
added
doc
Anonymitaet
approved these changes
Mar 9, 2021
|
/pulsarbot run-failure-checks |
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
Fixes #9790
Modifications
false: