Skip to content

Commit

Permalink
HBASE-26030 hbase-cleanup.sh did not clean the wal dir if hbase.wal.d…
Browse files Browse the repository at this point in the history
…ir configured individually (#3432)

Signed-off-by: Duo Zhang <zhangduo@apache.org>
  • Loading branch information
mokai87 authored Jul 3, 2021
1 parent 7aa0dfa commit b80d70c
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions bin/hbase-cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ if [ "$zparent" == "null" ]; then zparent="/hbase"; fi
hrootdir=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.rootdir`
if [ "$hrootdir" == "null" ]; then hrootdir="file:///tmp/hbase-${USER}/hbase"; fi

hbasewaldir=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.wal.dir`

check_for_znodes() {
command=$1;
case $command in
Expand Down Expand Up @@ -102,10 +104,16 @@ clean_up() {
;;
--cleanHdfs)
execute_hdfs_command "-rm -R ${hrootdir}"
if [ "${hbasewaldir}" != "null" ]; then
execute_hdfs_command "-rm -R ${hbasewaldir}"
fi
;;
--cleanAll)
execute_zk_command "deleteall ${zparent}";
execute_hdfs_command "-rm -R ${hrootdir}"
if [ "${hbasewaldir}" != "null" ]; then
execute_hdfs_command "-rm -R ${hbasewaldir}"
fi
;;
--cleanAcls)
execute_clean_acls;
Expand Down

0 comments on commit b80d70c

Please sign in to comment.