Skip to content

Commit

Permalink
[sn-platform][sn-platform-slim]: upgrade pulsar to 3.0 and enable 3.0…
Browse files Browse the repository at this point in the history
… new features (#1083)

* upgrade to use pulsar 3.0 on sn-platform

Signed-off-by: ericsyh <[email protected]>

* upgrade pulsar to 3.0 on slim chart

Signed-off-by: ericsyh <[email protected]>

* update example

Signed-off-by: ericsyh <[email protected]>

* disable direct io

Signed-off-by: ericsyh <[email protected]>

* remove transactionBufferSnapshotSegmentSize

Signed-off-by: ericsyh <[email protected]>

* don't enable the new LB by default

Signed-off-by: ericsyh <[email protected]>

* fix lint

Signed-off-by: ericsyh <[email protected]>

* update to fix comments

Signed-off-by: ericsyh <[email protected]>

---------

Signed-off-by: ericsyh <[email protected]>
  • Loading branch information
ericsyh authored Sep 14, 2023
1 parent be1ade1 commit 389d755
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 51 deletions.
39 changes: 22 additions & 17 deletions charts/sn-platform-slim/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,47 +120,47 @@ monitoring:
images:
zookeeper:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
customTools:
backup:
repository: "streamnative/pulsar-metadata-tool"
tag: "2.10.4.7"
tag: "3.0.0.4"
restore:
repository: "streamnative/pulsar-metadata-tool"
tag: "2.10.4.7"
tag: "3.0.0.4"
bookie:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
autorecovery:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
broker:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
proxy:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
pulsar_detector:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
functions:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
function_worker:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
# NOTE: allow overriding the toolset image
toolset:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
busybox:
repository: busybox
Expand Down Expand Up @@ -193,7 +193,7 @@ images:
pullPolicy: "IfNotPresent"
pulsar_metadata:
repository: streamnative/sn-platform-slim
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
configmapReload:
repository: jimmidyson/configmap-reload
Expand Down Expand Up @@ -913,6 +913,8 @@ bookkeeper:
gcLoggingOptions: []
custom: {}
configData: {}
# For Pulsar 3.0, please do not enable Direct IO. Needs a fix https://github.com/apache/bookkeeper/pull/4041
# PULSAR_PREFIX_dbStorage_directIOEntryLogger: "false"
## Operator Controller
## templates/bookkeeper-cluster.yaml
operator:
Expand Down Expand Up @@ -1169,16 +1171,19 @@ broker:
extraOptions: []
gcLoggingOptions: []
configData:
# @deprecated:
# 1. You can use a service account to assume an IAM role to access S3 bucket
# 2. You can use a k8s secret to reference AWS credentials. See `offload.s3.secret`
# AWS_ACCESS_KEY_ID: "[YOUR AWS ACCESS KEY ID]"
# AWS_SECRET_ACCESS_KEY: "[YOUR SECRET]"
managedLedgerDefaultEnsembleSize: "3"
managedLedgerDefaultWriteQuorum: "3"
managedLedgerDefaultAckQuorum: "2"
PULSAR_PREFIX_systemTopicEnabled: "true"
PULSAR_PREFIX_topicLevelPoliciesEnabled: "true"
# Enable the new delayed message
delayedDeliveryTrackerFactoryClassName: "org.apache.pulsar.broker.delayed.BucketDelayedDeliveryTrackerFactory"
# Enable transaction buffer segmented snapshot
transactionBufferSegmentedSnapshotEnabled: "true"
# Enable the new Load Balancer, please make sure your cluster is already on Pulsar 3.0 then to use.
# Mix of new and previous Load Balancer in the same cluster will lead to unexpected problems.
# loadManagerClassName: "org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl"
# loadBalancerLoadSheddingStrategy: "org.apache.pulsar.broker.loadbalance.extensions.scheduler.TransferShedder"
### Broker service account
## templates/broker-service-account.yaml
# deprecated: use `serviceAccount` section to configure service account.
Expand Down
43 changes: 24 additions & 19 deletions charts/sn-platform/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,22 +130,22 @@ monitoring:
images:
zookeeper:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
customTools:
backup:
repository: "streamnative/pulsar-metadata-tool"
tag: "2.10.4.7"
tag: "3.0.0.4"
restore:
repository: "streamnative/pulsar-metadata-tool"
tag: "2.10.4.7"
tag: "3.0.0.4"
bookie:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
presto:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
exporter:
repository: bitnami/jmx-exporter
Expand All @@ -154,36 +154,36 @@ images:
# NOTE: allow overriding the presto worker image
# presto_worker:
# repository: streamnative/sn-platform
# tag: 2.10.4.7
# tag: 3.0.0.4
# pullPolicy: IfNotPresent
autorecovery:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
broker:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
proxy:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
pulsar_detector:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
functions:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
function_worker:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
# NOTE: allow overriding the toolset image
toolset:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
kafka:
repository: bitnami/kafka
Expand Down Expand Up @@ -239,7 +239,7 @@ images:
pullPolicy: IfNotPresent
pulsar_metadata:
repository: streamnative/sn-platform
tag: "2.10.4.7"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
configmapReload:
repository: jimmidyson/configmap-reload
Expand Down Expand Up @@ -988,6 +988,8 @@ bookkeeper:
gcLoggingOptions: []
custom: {}
configData: {}
# For Pulsar 3.0, please do not enable Direct IO. Needs a fix https://github.com/apache/bookkeeper/pull/4041
# PULSAR_PREFIX_dbStorage_directIOEntryLogger: "false"
## Operator Controller
## templates/bookkeeper-cluster.yaml
operator:
Expand Down Expand Up @@ -1244,16 +1246,19 @@ broker:
extraOptions: []
gcLoggingOptions: []
configData:
# @deprecated:
# 1. You can use a service account to assume an IAM role to access S3 bucket
# 2. You can use a k8s secret to reference AWS credentials. See `offload.s3.secret`
# AWS_ACCESS_KEY_ID: "[YOUR AWS ACCESS KEY ID]"
# AWS_SECRET_ACCESS_KEY: "[YOUR SECRET]"
managedLedgerDefaultEnsembleSize: "3"
managedLedgerDefaultWriteQuorum: "3"
managedLedgerDefaultAckQuorum: "2"
PULSAR_PREFIX_systemTopicEnabled: "true"
PULSAR_PREFIX_topicLevelPoliciesEnabled: "true"
# Enable the new delayed message
delayedDeliveryTrackerFactoryClassName: "org.apache.pulsar.broker.delayed.BucketDelayedDeliveryTrackerFactory"
# Enable transaction buffer segmented snapshot
transactionBufferSegmentedSnapshotEnabled: "true"
# Enable the new Load Balancer, please make sure your cluster is already on Pulsar 3.0 then to use.
# Mix of new and previous Load Balancer in the same cluster will lead to unexpected problems.
# loadManagerClassName: "org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl"
# loadBalancerLoadSheddingStrategy: "org.apache.pulsar.broker.loadbalance.extensions.scheduler.TransferShedder"
### Broker service account
## templates/broker-service-account.yaml
# deprecated: use `serviceAccount` section to configure service account.
Expand Down
30 changes: 15 additions & 15 deletions examples/sn-platform/values-pulsar-3.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,32 +19,32 @@

images:
zookeeper:
tag: "3.0.0.1"
tag: "3.0.0.4"
bookie:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"
autorecovery:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"
broker:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"
proxy:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"
pulsar_detector:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"
pullPolicy: IfNotPresent
functions:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"
function_worker:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"
toolset:
repository: streamnative/sn-platform
tag: "3.0.0.1"
tag: "3.0.0.4"

zookeeper:
jvm:
Expand All @@ -62,9 +62,9 @@ zookeeper:
-Dzookeeper.forceSync=no
bookkeeper:
configData:
# Enable DirectIO by default
PULSAR_PREFIX_dbStorage_directIOEntryLogger: "true"
configData: {}
# For Pulsar 3.0, please do not enable Direct IO. Needs a fix https://github.com/apache/bookkeeper/pull/4041
# PULSAR_PREFIX_dbStorage_directIOEntryLogger: "false"
jvm:
gcOptions:
- >
Expand All @@ -89,15 +89,15 @@ broker:
managedLedgerDefaultAckQuorum: "2"
PULSAR_PREFIX_systemTopicEnabled: "true"
PULSAR_PREFIX_topicLevelPoliciesEnabled: "true"
# Enable the new Load Balancer, not suggest to enable and use now.
# Wait for https://github.com/apache/pulsar/pull/20528, https://github.com/apache/pulsar/pull/20525 release for fix.
# Enable the new Load Balancer, please make sure your cluster is already on Pulsar 3.0 then to use.
# Mix of new and previous Load Balancer in the same cluster will lead to unexpected problems.
# loadManagerClassName: "org.apache.pulsar.broker.loadbalance.extensions.ExtensibleLoadManagerImpl"
# loadBalancerLoadSheddingStrategy: "org.apache.pulsar.broker.loadbalance.extensions.scheduler.TransferShedder"

# Enable the new delayed message
delayedDeliveryTrackerFactoryClassName: "org.apache.pulsar.broker.delayed.BucketDelayedDeliveryTrackerFactory"
# Enable transaction buffer segmented snapshot
transactionBufferSegmentedSnapshotEnabled: "true"
transactionBufferSnapshotSegmentSize: "262144"
jvm:
gcOptions:
- >
Expand Down

0 comments on commit 389d755

Please sign in to comment.