This is an automated email from the ASF dual-hosted git repository.
zhaocong pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-3.2 by this push:
new c7e373ad860 [fix] Revert "[fix][cli] Fix the shell script parameter
passthrough syntax (#22867)" (#22921)
c7e373ad860 is described below
commit c7e373ad860e198fa476aec7978f745d2fc783c9
Author: Cong Zhao <[email protected]>
AuthorDate: Mon Jun 17 11:25:47 2024 +0800
[fix] Revert "[fix][cli] Fix the shell script parameter passthrough syntax
(#22867)" (#22921)
(cherry picked from commit fa745384c2c3ea8c16e6c0cd078328a653fa3073)
---
bin/bookkeeper | 12 ++++++------
bin/pulsar | 38 +++++++++++++++++++-------------------
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/bin/bookkeeper b/bin/bookkeeper
index 13d092f4c99..0cc07dd49ab 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -214,20 +214,20 @@ OPTS="$OPTS $BK_METADATA_OPTIONS"
#Change to BK_HOME to support relative paths
cd "$BK_HOME"
if [ $COMMAND == "bookie" ]; then
- exec $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.server.Main --conf
$BOOKIE_CONF "$@"
+ exec $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.server.Main --conf
$BOOKIE_CONF $@
elif [ $COMMAND == "autorecovery" ]; then
- exec $JAVA $OPTS $JMX_ARGS
org.apache.bookkeeper.replication.AutoRecoveryMain --conf $BOOKIE_CONF "$@"
+ exec $JAVA $OPTS $JMX_ARGS
org.apache.bookkeeper.replication.AutoRecoveryMain --conf $BOOKIE_CONF $@
elif [ $COMMAND == "localbookie" ]; then
NUMBER=$1
shift
- exec $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.util.LocalBookKeeper
$NUMBER $BOOKIE_CONF "$@"
+ exec $JAVA $OPTS $JMX_ARGS org.apache.bookkeeper.util.LocalBookKeeper
$NUMBER $BOOKIE_CONF $@
elif [ $COMMAND == "upgrade" ]; then
- exec $JAVA $OPTS org.apache.bookkeeper.bookie.FileSystemUpgrade --conf
$BOOKIE_CONF "$@"
+ exec $JAVA $OPTS org.apache.bookkeeper.bookie.FileSystemUpgrade --conf
$BOOKIE_CONF $@
elif [ $COMMAND == "shell" ]; then
ENTRY_FORMATTER_ARG="-DentryFormatterClass=${ENTRY_FORMATTER_CLASS:-org.apache.bookkeeper.util.StringEntryFormatter}"
- exec $JAVA $OPTS $ENTRY_FORMATTER_ARG
org.apache.bookkeeper.bookie.BookieShell -conf $BOOKIE_CONF "$@"
+ exec $JAVA $OPTS $ENTRY_FORMATTER_ARG
org.apache.bookkeeper.bookie.BookieShell -conf $BOOKIE_CONF $@
elif [ $COMMAND == "help" -o $COMMAND == "--help" -o $COMMAND == "-h" ]; then
bookkeeper_help;
else
- exec $JAVA $OPTS $COMMAND "$@"
+ exec $JAVA $OPTS $COMMAND $@
fi
diff --git a/bin/pulsar b/bin/pulsar
index f6061601d88..ab0029af5b0 100755
--- a/bin/pulsar
+++ b/bin/pulsar
@@ -329,56 +329,56 @@ fi
cd "$PULSAR_HOME"
if [ $COMMAND == "broker" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-broker.log"}
- exec $JAVA $LOG4J2_SHUTDOWN_HOOK_DISABLED $OPTS
-Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.PulsarBrokerStarter
--broker-conf $PULSAR_BROKER_CONF "$@"
+ exec $JAVA $LOG4J2_SHUTDOWN_HOOK_DISABLED $OPTS
-Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.PulsarBrokerStarter
--broker-conf $PULSAR_BROKER_CONF $@
elif [ $COMMAND == "bookie" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"bookkeeper.log"}
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.bookkeeper.server.Main --conf $PULSAR_BOOKKEEPER_CONF "$@"
+ exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.bookkeeper.server.Main --conf $PULSAR_BOOKKEEPER_CONF $@
elif [ $COMMAND == "zookeeper" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"zookeeper.log"}
- exec $JAVA ${ZK_OPTS} $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.zookeeper.server.quorum.QuorumPeerMain $PULSAR_ZK_CONF "$@"
+ exec $JAVA ${ZK_OPTS} $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.zookeeper.server.quorum.QuorumPeerMain $PULSAR_ZK_CONF $@
elif [ $COMMAND == "global-zookeeper" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"global-zookeeper.log"}
# Allow global ZK to turn into read-only mode when it cannot reach the
quorum
OPTS="${OPTS} ${ZK_OPTS} -Dreadonlymode.enabled=true"
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.zookeeper.server.quorum.QuorumPeerMain $PULSAR_GLOBAL_ZK_CONF "$@"
+ exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.zookeeper.server.quorum.QuorumPeerMain $PULSAR_GLOBAL_ZK_CONF $@
elif [ $COMMAND == "configuration-store" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"configuration-store.log"}
# Allow global ZK to turn into read-only mode when it cannot reach the
quorum
OPTS="${OPTS} ${ZK_OPTS} -Dreadonlymode.enabled=true"
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.zookeeper.server.quorum.QuorumPeerMain
$PULSAR_CONFIGURATION_STORE_CONF "$@"
+ exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.zookeeper.server.quorum.QuorumPeerMain
$PULSAR_CONFIGURATION_STORE_CONF $@
elif [ $COMMAND == "proxy" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-proxy.log"}
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.proxy.server.ProxyServiceStarter --config $PULSAR_PROXY_CONF
"$@"
+ exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.proxy.server.ProxyServiceStarter --config $PULSAR_PROXY_CONF
$@
elif [ $COMMAND == "websocket" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-websocket.log"}
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.websocket.service.WebSocketServiceStarter
$PULSAR_WEBSOCKET_CONF "$@"
+ exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.websocket.service.WebSocketServiceStarter
$PULSAR_WEBSOCKET_CONF $@
elif [ $COMMAND == "functions-worker" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-functions-worker.log"}
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.functions.worker.FunctionWorkerStarter -c $PULSAR_WORKER_CONF
"$@"
+ exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.pulsar.functions.worker.FunctionWorkerStarter -c $PULSAR_WORKER_CONF
$@
elif [ $COMMAND == "standalone" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-standalone.log"}
- exec $JAVA $LOG4J2_SHUTDOWN_HOOK_DISABLED $OPTS ${ZK_OPTS}
-Dpulsar.log.file=$PULSAR_LOG_FILE -Dpulsar.config.file=$PULSAR_STANDALONE_CONF
org.apache.pulsar.PulsarStandaloneStarter "$@"
+ exec $JAVA $LOG4J2_SHUTDOWN_HOOK_DISABLED $OPTS ${ZK_OPTS}
-Dpulsar.log.file=$PULSAR_LOG_FILE -Dpulsar.config.file=$PULSAR_STANDALONE_CONF
org.apache.pulsar.PulsarStandaloneStarter $@
elif [ ${COMMAND} == "autorecovery" ]; then
PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-autorecovery.log"}
- exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.bookkeeper.replication.AutoRecoveryMain --conf
$PULSAR_BOOKKEEPER_CONF "$@"
+ exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE
org.apache.bookkeeper.replication.AutoRecoveryMain --conf
$PULSAR_BOOKKEEPER_CONF $@
elif [ $COMMAND == "initialize-cluster-metadata" ]; then
- exec $JAVA $OPTS org.apache.pulsar.PulsarClusterMetadataSetup "$@"
+ exec $JAVA $OPTS org.apache.pulsar.PulsarClusterMetadataSetup $@
elif [ $COMMAND == "delete-cluster-metadata" ]; then
- exec $JAVA $OPTS org.apache.pulsar.PulsarClusterMetadataTeardown "$@"
+ exec $JAVA $OPTS org.apache.pulsar.PulsarClusterMetadataTeardown $@
elif [ $COMMAND == "initialize-transaction-coordinator-metadata" ]; then
- exec $JAVA $OPTS
org.apache.pulsar.PulsarTransactionCoordinatorMetadataSetup "$@"
+ exec $JAVA $OPTS
org.apache.pulsar.PulsarTransactionCoordinatorMetadataSetup $@
elif [ $COMMAND == "initialize-namespace" ]; then
- exec $JAVA $OPTS org.apache.pulsar.PulsarInitialNamespaceSetup "$@"
+ exec $JAVA $OPTS org.apache.pulsar.PulsarInitialNamespaceSetup $@
elif [ $COMMAND == "zookeeper-shell" ]; then
- exec $JAVA $OPTS org.apache.zookeeper.ZooKeeperMain "$@"
+ exec $JAVA $OPTS org.apache.zookeeper.ZooKeeperMain $@
elif [ $COMMAND == "broker-tool" ]; then
- exec $JAVA $OPTS org.apache.pulsar.broker.tools.BrokerTool "$@"
+ exec $JAVA $OPTS org.apache.pulsar.broker.tools.BrokerTool $@
elif [ $COMMAND == "compact-topic" ]; then
- exec $JAVA $OPTS org.apache.pulsar.compaction.CompactorTool --broker-conf
$PULSAR_BROKER_CONF "$@"
+ exec $JAVA $OPTS org.apache.pulsar.compaction.CompactorTool --broker-conf
$PULSAR_BROKER_CONF $@
elif [ $COMMAND == "tokens" ]; then
- exec $JAVA $OPTS org.apache.pulsar.utils.auth.tokens.TokensCliUtils "$@"
+ exec $JAVA $OPTS org.apache.pulsar.utils.auth.tokens.TokensCliUtils $@
elif [ $COMMAND == "version" ]; then
- exec $JAVA $OPTS org.apache.pulsar.PulsarVersionStarter "$@"
+ exec $JAVA $OPTS org.apache.pulsar.PulsarVersionStarter $@
elif [ $COMMAND == "help" -o $COMMAND == "--help" -o $COMMAND == "-h" ]; then
pulsar_help;
else
