You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bookkeeper.apache.org by lu...@apache.org on 2023/05/10 03:05:33 UTC
[bookkeeper] branch master updated: drop invalid entryFormat arg from shell command (#3938)
This is an automated email from the ASF dual-hosted git repository.
lushiji pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git
The following commit(s) were added to refs/heads/master by this push:
new 551b2d5117 drop invalid entryFormat arg from shell command (#3938)
551b2d5117 is described below
commit 551b2d5117672aecb3f41def6d98e7055f00bb91
Author: wenbingshen <ol...@gmail.com>
AuthorDate: Wed May 10 11:05:27 2023 +0800
drop invalid entryFormat arg from shell command (#3938)
---
bin/bookkeeper | 4 +---
conf/bkenv.sh | 3 ---
site3/website/docs/reference/cli.md | 1 -
tests/docker-images/statestore-image/bin/bookkeeper | 3 +--
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/bin/bookkeeper b/bin/bookkeeper
index cffc267cc7..7ad73b655b 100755
--- a/bin/bookkeeper
+++ b/bin/bookkeeper
@@ -87,7 +87,6 @@ Environment variables:
BOOKIE_ZK_CONF Configuration file for zookeeper (default: $DEFAULT_ZK_CONF)
BOOKIE_EXTRA_OPTS Extra options to be passed to the jvm
BOOKIE_EXTRA_CLASSPATH Add extra paths to the bookkeeper classpath
- ENTRY_FORMATTER_CLASS Entry formatter class to format entries.
BOOKIE_PID_DIR Folder where the Bookie server PID file should be stored
BOOKIE_STOP_TIMEOUT Wait time before forcefully kill the Bookie server instance, if the stop is not successful
@@ -173,8 +172,7 @@ elif [ $COMMAND == "zookeeper" ]; then
BOOKIE_LOG_FILE=${BOOKIE_LOG_FILE:-"zookeeper.log"}
exec "${JAVA}" $OPTS -Dbookkeeper.log.file=$BOOKIE_LOG_FILE org.apache.zookeeper.server.quorum.QuorumPeerMain $BOOKIE_ZK_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} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@
elif [ ${COMMAND} == "help" ]; then
bookkeeper_help;
else
diff --git a/conf/bkenv.sh b/conf/bkenv.sh
index 570e0c6f4a..d6446f1d10 100644
--- a/conf/bkenv.sh
+++ b/conf/bkenv.sh
@@ -43,9 +43,6 @@
# Wait time before forcefully kill the Bookie server instance, if the stop is not successful
# BOOKIE_STOP_TIMEOUT=
-# Entry formatter class to format entries.
-# ENTRY_FORMATTER_CLASS=
-
# this default config dir should match the 'localBookiesConfigDirectory' config value in the conf file of LocalBookKeeper
# LOCALBOOKIES_CONFIG_DIR=/tmp/localbookies-config
diff --git a/site3/website/docs/reference/cli.md b/site3/website/docs/reference/cli.md
index 02b8486c44..de003619ef 100644
--- a/site3/website/docs/reference/cli.md
+++ b/site3/website/docs/reference/cli.md
@@ -14,7 +14,6 @@ Manages bookies.
| `BOOKIE_LOG_CONF` | The Log4j configuration file. | `${bookkeeperHome}/bookkeeper-server/conf/log4j2.xml` |
| `BOOKIE_CONF` | The configuration file for the bookie. | `${bookkeeperHome}/bookkeeper-server/conf/bk_server.conf` |
| `BOOKIE_EXTRA_CLASSPATH` | Extra paths to add to BookKeeper's [classpath](https://en.wikipedia.org/wiki/Classpath_(Java)). | |
-| `ENTRY_FORMATTER_CLASS` | The entry formatter class used to format entries. | |
| `BOOKIE_PID_DIR` | The directory where the bookie server PID file is stored. | |
| `BOOKIE_STOP_TIMEOUT` | The wait time before forcefully killing the bookie server instance if stopping it is not successful. | |
diff --git a/tests/docker-images/statestore-image/bin/bookkeeper b/tests/docker-images/statestore-image/bin/bookkeeper
index 5cbedc47b0..8135263024 100755
--- a/tests/docker-images/statestore-image/bin/bookkeeper
+++ b/tests/docker-images/statestore-image/bin/bookkeeper
@@ -112,8 +112,7 @@ elif [ $COMMAND == "zookeeper" ]; then
BOOKIE_LOG_FILE=${BOOKIE_LOG_FILE:-"zookeeper.log"}
exec $JAVA $OPTS -Dbookkeeper.log.file=$BOOKIE_LOG_FILE -Dzookeeper.4lw.commands.whitelist='*' org.apache.zookeeper.server.quorum.QuorumPeerMain $BOOKIE_ZK_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} org.apache.bookkeeper.bookie.BookieShell -conf ${BOOKIE_CONF} $@
else
exec ${JAVA} ${OPTS} ${COMMAND} $@
fi