Skip to content
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.

Sign up for GitHub

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

Make the backup can run when zookeeper reconfig enabled #1143

Merged
merged 6 commits into from
Mar 7, 2024
Merged

Make the backup can run when zookeeper reconfig enabled #1143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7abfc3a
Make the backup can run when zookeeper reconfig enabled
zymap Feb 6, 2024
81cd1d1
Apply change to the platform slim
zymap Mar 7, 2024
6516900
Merge branch 'master' into yong/imporve-backup-to-support-reconfig
zymap Mar 7, 2024
49dcf7e
Merge branch 'master' into yong/imporve-backup-to-support-reconfig
ericsyh Mar 7, 2024
77266cf
fix chart lint
ericsyh Mar 7, 2024
0ccebb3
fix chart lint
ericsyh Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/sn-platform-slim/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ sources:
icon: https://raw.githubusercontent.com/streamnative/charts/master/static/logo.svg
maintainers:
- name: StreamNative Support
email: [email protected]
email: [email protected]
4 changes: 0 additions & 4 deletions charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ data:
secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
PULSAR_PREFIX_secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
{{- end }}
{{- if .Values.zookeeper.reconfig.enabled }}
PULSAR_PREFIX_reconfigEnabled: "true"
PULSAR_PREFIX_quorumListenOnAllIPs: "true"
{{- end }}
PULSAR_PREFIX_peerType: "observer"
{{ toYaml .Values.zookeeper.customTools.backup.configData | indent 2 }}
# Include log configuration file, If you want to configure the log level and other configuration
Expand Down
2 changes: 1 addition & 1 deletion charts/sn-platform-slim/templates/zookeeper/zookeeper-backup-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ spec:
{{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{ end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{ printf "%d" $i }}{{ end }}
envFrom:
- configMapRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"
name: "{{ template "pulsar.fullname" . }}-backup"
{{- if .Values.zookeeper.probe.readiness.enabled }}
readinessProbe:
exec:
Expand Down
6 changes: 3 additions & 3 deletions charts/sn-platform-slim/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1042,7 +1042,7 @@ broker:
format: "text"
# The template field can totally change the log config of the component. The value is a string, which is the content of the log config file.
template: {}

# use a component name that matches your grafana configuration
# so the metrics are correctly rendered in grafana dashboard
component: broker
Expand Down Expand Up @@ -1202,8 +1202,8 @@ broker:
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.
# 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
Expand Down
4 changes: 0 additions & 4 deletions charts/sn-platform/templates/zookeeper/zookeeper-backup-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ data:
secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
PULSAR_PREFIX_secureClientPort: "{{ .Values.zookeeper.ports.clientTls }}"
{{- end }}
{{- if .Values.zookeeper.reconfig.enabled }}
PULSAR_PREFIX_reconfigEnabled: "true"
PULSAR_PREFIX_quorumListenOnAllIPs: "true"
{{- end }}
PULSAR_PREFIX_peerType: "observer"
{{ toYaml .Values.zookeeper.customTools.backup.configData | indent 2 }}
# Include log configuration file, If you want to configure the log level and other configuration
Expand Down
2 changes: 1 addition & 1 deletion charts/sn-platform/templates/zookeeper/zookeeper-backup-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ spec:
{{ range $i, $e := until (.Values.zookeeper.replicaCount | int) }}{{ if ne $i 0 }},{{ end }}{{ template "pulsar.fullname" $global }}-{{ $global.Values.zookeeper.component }}-{{ printf "%d" $i }}{{ end }}
envFrom:
- configMapRef:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.zookeeper.component }}"
name: "{{ template "pulsar.fullname" . }}-backup"
{{- if .Values.zookeeper.probe.readiness.enabled }}
readinessProbe:
exec:
Expand Down
Loading