[Bookie] Fallback to PULSAR_EXTRA_OPTS if BOOKIE_EXTRA_OPTS isn't defined#10397
Merged
codelipenghui merged 1 commit intoapache:masterfrom Apr 28, 2021
Conversation
…ined
- don't pass -Dio.netty.* system properties if PULSAR_EXTRA_OPTS or
BOOKIE_EXTRA_OPTS is set
- this is to be consistent with PULSAR_EXTRA_OPTS behavior and
to prevent duplicate properties
- add "-Dio.netty.leakDetectionLevel=disabled" unless BOOKIE_EXTRA_OPTS
is set since PULSAR_EXTRA_OPTS doesn't include that setting by default
- apache#9469 introduced a breaking change by changing the behavior
Member
Author
|
@eolivelli This and #9621 is needed in 2.7.2 because #9469 in 2.7.1 causes issues for users upgrading to 2.7.x . There's a slack discussion about it. |
Member
Author
|
@codelipenghui @Renkai @eolivelli @murong00 @sijie @addisonj Please review. This is a follow up to #9469 since it breaks backwards compatibility for Pulsar users that are upgrading to Pulsar 2.7.1. |
eolivelli
approved these changes
Apr 28, 2021
codelipenghui
approved these changes
Apr 28, 2021
eolivelli
pushed a commit
that referenced
this pull request
Apr 28, 2021
…ined (#10397) ### Motivation - #9469 introduced a breaking change by changing the behavior . This change was part of 2.7.1 release. ### Modifications - fallback to `PULSAR_EXTRA_OPTS` if `BOOKIE_EXTRA_OPTS` isn't defined - don't pass `-Dio.netty.*` system properties if `PULSAR_EXTRA_OPTS` or `BOOKIE_EXTRA_OPTS` is set - this is to be consistent with `PULSAR_EXTRA_OPTS` behavior and to prevent duplicate properties - add `-Dio.netty.leakDetectionLevel=disabled` unless `BOOKIE_EXTRA_OPTS` is set since `PULSAR_EXTRA_OPTS` doesn't include that setting by default. (`simple` is the default if the property isn't set) ### Other context - It is also necessary to cherry-pick #9621 to restore backwards compatibility in 2.7.x branch.
Contributor
|
@lhotari |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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
Modifications
fallback to
PULSAR_EXTRA_OPTSifBOOKIE_EXTRA_OPTSisn't defineddon't pass
-Dio.netty.*system properties ifPULSAR_EXTRA_OPTSorBOOKIE_EXTRA_OPTSis setPULSAR_EXTRA_OPTSbehavior andto prevent duplicate properties
-Dio.netty.leakDetectionLevel=disabledunlessBOOKIE_EXTRA_OPTSis set since
PULSAR_EXTRA_OPTSdoesn't include that setting by default.(
simpleis the default if the property isn't set)Other context