-
Notifications
You must be signed in to change notification settings - Fork 3.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix usage of PULSAR_EXTRA_OPTS/BOOKIE_EXTRA_OPTS in startup scripts #13025
Fix usage of PULSAR_EXTRA_OPTS/BOOKIE_EXTRA_OPTS in startup scripts #13025
Conversation
- don't combine variables in BOOKIE_EXTRA_OPTS - don't add PULSAR_GC_LOG to PULSAR_EXTRA_OPTS - make BOOKIE_GC_LOG default to PULSAR_GC_LOG for consistency - apply PULSAR_EXTRA_OPTS and BOOKIE_EXTRA_OPTS after other settings so that it is possible to override settings defined by PULSAR_MEM / PULSAR_GC
@lhotari:Thanks for your contribution. For this PR, do we need to update docs? |
@lhotari:Thanks for providing doc info! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
* up/master: (75 commits) [website][upgrade]feat: website upgrade / docs migration - 2.5.1 Get Started/Concepts and Architecture/Pulsar Schema (apache#13030) Fix environment variable assignment in startup scripts (apache#13025) update 2.8.x (apache#13029) [Doc] add tips for Pulsar tools (apache#13044) Suggest to use tlsPort instead of deprecated TlsEnable (apache#13039) Integration tests for function-worker rebalance and drain operations. (apache#13058) fix(functions): missing runtime set in GoInstanceConfig (apache#13031) [pulsar-admin] Add get-replicated-subscription-status command for topic (apache#12891) [Broker] Consider topics in pulsar/system namespace as system topics (apache#13050) Fix typo: correct sizeUint to sizeUnit (apache#13040) fix-12894 (apache#12896) Don't attempt to delete pending ack store unless transactions are enabled (apache#13041) [Perf] Evaluate the current protocol version once (apache#13045) Fix Issue apache#12885, Unordered consuming case in Key_Shared subscription (apache#12890) [broker]Optimize topicMaxMessageSize with topic local cache. (apache#12830) [PIP-105] Part-2 Support pluggable entry filter in Dispatcher (apache#12970) [website] Modify admin-api-topic.md document (apache#12996) add missed import (apache#13037) [metadata] Add RocksdbMetadataStore (apache#12776) [C] Add pulsar_client_subscribe_multi_topics and pulsar_client_subscribe_pattern (apache#12965) ... # Conflicts: # site2/website-next/docusaurus.config.js # site2/website-next/versioned_sidebars/version-2.6.1-sidebars.json # site2/website-next/versions.json
- don't combine variables in BOOKIE_EXTRA_OPTS - don't add PULSAR_GC_LOG to PULSAR_EXTRA_OPTS - make BOOKIE_GC_LOG default to PULSAR_GC_LOG for consistency - apply PULSAR_EXTRA_OPTS and BOOKIE_EXTRA_OPTS after other settings so that it is possible to override settings defined by PULSAR_MEM / PULSAR_GC
Please make sure this change is referenced in the 2.10 release notes as it is a breaking change for OpenMessaging/Benchmarks (at least for me) |
- don't combine variables in BOOKIE_EXTRA_OPTS - don't add PULSAR_GC_LOG to PULSAR_EXTRA_OPTS - make BOOKIE_GC_LOG default to PULSAR_GC_LOG for consistency - apply PULSAR_EXTRA_OPTS and BOOKIE_EXTRA_OPTS after other settings so that it is possible to override settings defined by PULSAR_MEM / PULSAR_GC (cherry picked from commit f00ee7b)
Motivation
The changes in #11285 broke
pulsar-perf
and it fails with errorWhen analyzing the problem, it seems that the usage of
PULSAR_EXTRA_OPTS
/BOOKIE_EXTRA_OPTS
environment variables isn't correctly used. It should be possible to usePULSAR_EXTRA_OPTS
/BOOKIE_EXTRA_OPTS
to add additional environment variables. This PR fixes that issue.Modifications
BOOKIE_MEM
,BOOKIE_GC
andBOOKIE_GC_LOG
inBOOKIE_EXTRA_OPTS
PULSAR_GC_LOG
toPULSAR_EXTRA_OPTS
BOOKIE_GC_LOG
default toPULSAR_GC_LOG
for consistencyPULSAR_EXTRA_OPTS
andBOOKIE_EXTRA_OPTS
after other settings so that it is possible to overridesettings defined by
PULSAR_MEM
/PULSAR_GC
/BOOKIE_MEM
/BOOKIE_GC
.Documentation
no-need-doc