Skip to content

ZOOKEEPER-4985 Fix zkCleanup.sh script to not fail on non-standard config directories #2324

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

Open
lfrancke wants to merge 7 commits into
base: master
Choose a base branch
from
+20 −13
Open

ZOOKEEPER-4985 Fix zkCleanup.sh script to not fail on non-standard config directories #2324

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d4c905f
ZOOKEEPER-4985 Fix zkCleanup.sh script to not fail on non-standard co…
lfrancke Oct 6, 2025
6931054
Fix shfmt error
lfrancke Oct 6, 2025
237f5b7
Update bin/zkCleanup.sh
lfrancke Nov 19, 2025
fb5eb34
Address review comments
lfrancke Nov 19, 2025
63b2e59
Address review comments
lfrancke Mar 10, 2026
e31a646
Handle greedy sed matching and whitespace trimming
lfrancke Mar 10, 2026
d4b8d01
Merge branch 'master' into feat/ZOOKEEPER-4985-rebased
lfrancke Mar 10, 2026
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
33 changes: 20 additions & 13 deletions bin/zkCleanup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,34 @@
# use POSIX interface, symlink is followed automatically
ZOOBIN="${BASH_SOURCE-$0}"
ZOOBIN="$(dirname "$ZOOBIN")"
ZOOBINDIR="$(cd "$ZOOBIN" && pwd)"
ZOOBINDIR="$(cd "$ZOOBIN" && pwd)" || exit

if [[ -e "$ZOOBIN/../libexec/zkEnv.sh" ]]; then
# shellcheck source=bin/zkEnv.sh
. "$ZOOBINDIR"/../libexec/zkEnv.sh
. "$ZOOBINDIR"/../libexec/zkEnv.sh "$@"
else
# shellcheck source=bin/zkEnv.sh
. "$ZOOBINDIR"/zkEnv.sh
. "$ZOOBINDIR"/zkEnv.sh "$@"
fi

ZOODATADIR="$(grep "^[[:space:]]*dataDir=" "$ZOOCFG" | sed -e 's/.*=//')"
ZOODATALOGDIR="$(grep "^[[:space:]]*dataLogDir=" "$ZOOCFG" | sed -e 's/.*=//')"
ZOODATADIR=""
ZOODATALOGDIR=""

# Only try to read config if ZOOCFG exists
if [[ -f $ZOOCFG ]]; then
re='^[^=]*=[[:space:]]*(.*)[[:space:]]*$'
ZOODATADIR="$(grep "^[[:space:]]*dataDir=" "$ZOOCFG" 2>/dev/null)"
[[ $ZOODATADIR =~ $re ]] && ZOODATADIR="${BASH_REMATCH[1]}"
ZOODATALOGDIR="$(grep "^[[:space:]]*dataLogDir=" "$ZOOCFG" 2>/dev/null)"
[[ $ZOODATALOGDIR =~ $re ]] && ZOODATALOGDIR="${BASH_REMATCH[1]}"
fi

ZOO_LOG_FILE=zookeeper-$USER-cleanup-$HOSTNAME.log

# shellcheck disable=SC2206
flags=($JVMFLAGS)
if [[ -z $ZOODATALOGDIR ]]; then
"$JAVA" "-Dzookeeper.log.dir=$ZOO_LOG_DIR" "-Dzookeeper.log.file=$ZOO_LOG_FILE" "${flags[@]}" \
org.apache.zookeeper.server.PurgeTxnLog "$ZOODATADIR" "$@"
else
"$JAVA" "-Dzookeeper.log.dir=$ZOO_LOG_DIR" "-Dzookeeper.log.file=$ZOO_LOG_FILE" "${flags[@]}" \
org.apache.zookeeper.server.PurgeTxnLog "$ZOODATALOGDIR" "$ZOODATADIR" "$@"
fi
flags=("-Dzookeeper.log.dir=$ZOO_LOG_DIR" "-Dzookeeper.log.file=$ZOO_LOG_FILE" $JVMFLAGS)

directories=()
[[ -n $ZOODATADIR ]] && directories=("$ZOODATADIR")
[[ -n $ZOODATALOGDIR ]] && directories=("$ZOODATALOGDIR" "${directories[@]}")
"$JAVA" "${flags[@]}" org.apache.zookeeper.server.PurgeTxnLog "${directories[@]}" "$@"