[pulsar-admin] New option takes precedence over deprecated option #12260
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
eolivelli
approved these changes
Oct 4, 2021
315157973
approved these changes
Oct 11, 2021
hangc0276
approved these changes
Oct 12, 2021
zeo1995
pushed a commit
to zeo1995/pulsar
that referenced
this pull request
Oct 14, 2021
* up/master: (26 commits) [pulsar-admin] Allow setting --forward-source-message-property to false when updating a pulsar function (apache#12128) [website][upgrade]feat: docs migration - Development (apache#12320) Update delete inactive topic configuration documentation (apache#12350) [PIP 95][Issue 12040][broker] Multiple bind addresses for Pulsar protocol (apache#12056) Added Debezium Source for MS SQL Server (apache#12256) Fix: flaky oracle tests (apache#12306) [C++] Use URL encoded content type for OAuth 2.0 authentication (apache#12341) [C++] Handle OAuth 2.0 exceptional cases gracefully (apache#12335) feat(cli): add restart command to pulsar-daemon (apache#12279) [client-tools] Remove redundant initial value (apache#12296) Make AuthenticationTokenTest to run on windows (apache#12329) [offload] fix FileSystemManagedLedgerOffloader can not cleanup outdated ledger data (apache#12309) [Doc]--Update contents for Pulsar adaptor for Apache Spark (apache#12338) [PIP 95][Issue 12040][broker] Improved multi-listener in standalone mode (apache#12066) [website][upgrade]feat: docs migration - Cookbooks (apache#12319) [testclient] Make --payload-file take effect in PerformanceClient (apache#12187) [website][upgrade]feat: docs migration - adaptor (apache#12318) [pulsar-client] Add partition-change api for producer/consumer interceptors (apache#12287) [Transaction]Fix lowWaterMark of TopicTransactionBuffer (apache#12312) [pulsar-admin] New option takes precedence over deprecated option (apache#12260) ... # Conflicts: # site2/website-next/docusaurus.config.js # site2/website-next/versions.json
bharanic-dev
pushed a commit
to bharanic-dev/pulsar
that referenced
this pull request
Mar 18, 2022
…ache#12260) ### Motivation Currently, we use new option to replace some deprecated option in client-tools. for example: pulsar/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java ```java @parameter(names = "--brokerServiceUrl", description = "The URL for the Pulsar broker", hidden = true) protected String DEPRECATED_brokerServiceUrl; @parameter(names = "--broker-service-url", description = "The URL for the Pulsar broker") protected String brokerServiceUrl; ``` In order to maintain compatibility, the deprecated option still take effect through merging, as below: pulsar/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java ```java private void mergeArgs() { if (!isBlank(DEPRECATED_brokerServiceUrl)) brokerServiceUrl = DEPRECATED_brokerServiceUrl; if (!isBlank(DEPRECATED_clientAuthPlugin)) clientAuthPlugin = DEPRECATED_clientAuthPlugin; if (!isBlank(DEPRECATED_clientAuthParams)) clientAuthParams = DEPRECATED_clientAuthParams; if (DEPRECATED_useTls != null) useTls = DEPRECATED_useTls; if (DEPRECATED_tlsAllowInsecureConnection != null) tlsAllowInsecureConnection = DEPRECATED_tlsAllowInsecureConnection; if (DEPRECATED_tlsHostNameVerificationEnabled != null) tlsHostNameVerificationEnabled = DEPRECATED_tlsHostNameVerificationEnabled; if (!isBlank(DEPRECATED_tlsTrustCertFilePath)) tlsTrustCertFilePath = DEPRECATED_tlsTrustCertFilePath; } ``` But I found that its priority is higher than the new option, which causes the new option to be invalid when we set both at the same time. ### Modifications Adjust the priority of the new and deprecated option, the deprecated option only takes effect when the new option is not set.
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
Currently, we use new option to replace some deprecated option in
client-tools. for example:pulsar/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
Lines 141 to 144 in 9d30914
In order to maintain compatibility, the deprecated option still take effect through merging, as below:
pulsar/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdSources.java
Lines 183 to 191 in 9d30914
But I found that its priority is higher than the new option, which causes the new option to be invalid when we set both at the same time.
Modifications
Adjust the priority of the new and deprecated option, the deprecated option only takes effect when the new option is not set.
Documentation