diff --git a/addons-cluster/zookeeper/templates/cluster.yaml b/addons-cluster/zookeeper/templates/cluster.yaml index 01ad5742e..7c0749019 100644 --- a/addons-cluster/zookeeper/templates/cluster.yaml +++ b/addons-cluster/zookeeper/templates/cluster.yaml @@ -30,7 +30,7 @@ spec: {{- if .Values.storageClassName }} storageClassName: {{ .Values.storageClassName | quote }} {{- end }} - - name: log + - name: snapshot-log spec: {{- if .Values.storageClassName }} storageClassName: {{ .Values.storageClassName | quote }} diff --git a/addons/zookeeper/config/log4j.properties b/addons/zookeeper/config/log4j.properties index fb9329cfb..d3bf52671 100644 --- a/addons/zookeeper/config/log4j.properties +++ b/addons/zookeeper/config/log4j.properties @@ -6,7 +6,7 @@ zookeeper.log.dir=/opt/bitnami/zookeeper/logs zookeeper.log.file=zookeeper.log zookeeper.log.threshold=INFO zookeeper.log.maxfilesize=256MB -zookeeper.log.maxbackupindex=20 +zookeeper.log.maxbackupindex=4 zookeeper.tracelog.dir=/opt/bitnami/zookeeper/logs zookeeper.tracelog.file=zookeeper_trace.log diff --git a/addons/zookeeper/config/zookeeper-config.tpl b/addons/zookeeper/config/zookeeper-config.tpl index d34b90f3c..3277ff3f5 100644 --- a/addons/zookeeper/config/zookeeper-config.tpl +++ b/addons/zookeeper/config/zookeeper-config.tpl @@ -24,10 +24,10 @@ maxClientCnxns=500 # http://zookeeper.apache.org/doc/current/zookeeperAdmin.html#sc_maintenance # # The number of snapshots to retain in dataDir -#autopurge.snapRetainCount=3 +autopurge.snapRetainCount=5 # Purge task interval in hours # Set to "0" to disable auto purge feature -#autopurge.purgeInterval=1 +autopurge.purgeInterval=12 ## Metrics Providers # @@ -39,7 +39,7 @@ maxClientCnxns=500 {{- end }} # whitelist -4lw.commands.whitelist=srvr, mntr, ruok, conf, stat +4lw.commands.whitelist=srvr, mntr, ruok, conf, stat, sync # cluster server list {{- printf "\n" }} diff --git a/addons/zookeeper/templates/_helpers.tpl b/addons/zookeeper/templates/_helpers.tpl index 71d2dc713..c2b8fd483 100644 --- a/addons/zookeeper/templates/_helpers.tpl +++ b/addons/zookeeper/templates/_helpers.tpl @@ -55,6 +55,7 @@ Common annotations */}} {{- define "zookeeper.annotations" -}} helm.sh/resource-policy: keep +apps.kubeblocks.io/skip-immutable-check: "true" {{ include "zookeeper.apiVersion" . }} {{- end }} diff --git a/addons/zookeeper/templates/cmpd.yaml b/addons/zookeeper/templates/cmpd.yaml index 5aa9877a7..6d7d4ed42 100644 --- a/addons/zookeeper/templates/cmpd.yaml +++ b/addons/zookeeper/templates/cmpd.yaml @@ -101,7 +101,7 @@ spec: /kubeblocks/scripts/roleprobe.sh runtime: volumes: - - name: snapshot-log + - name: log emptyDir: {} securityContext: fsGroup: 0