From 002fd9598d2cdc7e365c42bfe72ef13003bd4419 Mon Sep 17 00:00:00 2001 From: Y-Rookie Date: Wed, 23 Oct 2024 20:12:58 +0800 Subject: [PATCH] fix pulsar typo --- addons/pulsar/scripts/init-broker.sh | 5 ----- addons/pulsar/scripts/start-bookies.sh | 1 + addons/pulsar/templates/_helpers.tpl | 18 +++++++++--------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/addons/pulsar/scripts/init-broker.sh b/addons/pulsar/scripts/init-broker.sh index cd6e624e8..e2147cb0e 100755 --- a/addons/pulsar/scripts/init-broker.sh +++ b/addons/pulsar/scripts/init-broker.sh @@ -85,11 +85,6 @@ init_broker() { fi initialize_cluster_metadata "$clusterName" "$zookeeperServers" "$webServiceUrl" "$brokerServiceUrl" - quit_script -} - -quit_script() { - (curl -sf -XPOST http://127.0.0.1:15020/quitquitquit || true) && exit 0 } # This is magic for shellspec ut framework. diff --git a/addons/pulsar/scripts/start-bookies.sh b/addons/pulsar/scripts/start-bookies.sh index 705d4bf2e..82950b7c4 100755 --- a/addons/pulsar/scripts/start-bookies.sh +++ b/addons/pulsar/scripts/start-bookies.sh @@ -86,6 +86,7 @@ start_bookies() { fi OPTS="${OPTS} -Dlog4j2.formatMsgNoLookups=true" + export OPTS exec bin/pulsar bookie } diff --git a/addons/pulsar/templates/_helpers.tpl b/addons/pulsar/templates/_helpers.tpl index ce1c3f860..deb0421bb 100644 --- a/addons/pulsar/templates/_helpers.tpl +++ b/addons/pulsar/templates/_helpers.tpl @@ -91,21 +91,21 @@ Generate major version of cluster {{- end }} {{/* -Define pulsar bookies reovery component definition regex pattern +Define pulsar bookies recovery component definition regex pattern */}} {{- define "pulsar.bkRecoveryCmpdRegexPattern" -}} ^pulsar-bookies-recovery- {{- end -}} {{/* -Define pulsar v3.X bookies reovery component definition name +Define pulsar v3.X bookies recovery component definition name */}} {{- define "pulsar3.bkRecoveryCmpdName" -}} pulsar-bookies-recovery-3-{{ .Chart.Version }} {{- end -}} {{/* -Define pulsar v2.X bookies reovery component definition name +Define pulsar v2.X bookies recovery component definition name */}} {{- define "pulsar2.bkRecoveryCmpdName" -}} pulsar-bookies-recovery-2-{{ .Chart.Version }} @@ -154,7 +154,7 @@ Define pulsar v3.X broker component definition regex pattern {{- end -}} {{/* -Define pulsar v2.X bookies reovery component definition name +Define pulsar v2.X broker component definition name */}} {{- define "pulsar2.brokerCmpdName" -}} pulsar-broker-2-{{ .Chart.Version }} @@ -182,7 +182,7 @@ pulsar-proxy-3-{{ .Chart.Version }} {{- end -}} {{/* -Define pulsar v2.X bookies reovery component definition name +Define pulsar v2.X proxy component definition name */}} {{- define "pulsar2.proxyCmpdName" -}} pulsar-proxy-2-{{ .Chart.Version }} @@ -266,28 +266,28 @@ pulsar-env-constraints {{- end -}} {{/* -Define pulsar v3.X bookies recovery config tpl name +Define pulsar v3.X bookies config tpl name */}} {{- define "pulsar3.bookiesConfigTplName" -}} pulsar3-bookies-config-tpl {{- end -}} {{/* -Define pulsar v2.X bookies recovery config tpl name +Define pulsar v2.X bookies config tpl name */}} {{- define "pulsar2.bookiesConfigTplName" -}} pulsar2-bookies-config-tpl {{- end -}} {{/* -Define pulsar v3.X bookies recovery config constraint name +Define pulsar v3.X bookies config constraint name */}} {{- define "pulsar3.bookiesConfigConstraintName" -}} pulsar3-bookies-config-constraint {{- end -}} {{/* -Define pulsar v2.X bookies recovery config constraint name +Define pulsar v2.X bookies config constraint name */}} {{- define "pulsar2.bookiesConfigConstraintName" -}} pulsar2-bookies-config-constraint