[hbase] branch master updated: HBASE-26030 hbase-cleanup.sh did not clean the wal dir if hbase.wal.dir configured individually (#3432)

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/master by this push:
     new b80d70c  HBASE-26030 hbase-cleanup.sh did not clean the wal dir if 
hbase.wal.dir configured individually (#3432)
b80d70c is described below

commit b80d70cd5356cf582b3a584c41b1b9c4f7784e22
Author: mokai <moka...@126.com>
AuthorDate: Sat Jul 3 11:13:50 2021 +0800

    HBASE-26030 hbase-cleanup.sh did not clean the wal dir if hbase.wal.dir 
configured individually (#3432)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
---
 bin/hbase-cleanup.sh | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/bin/hbase-cleanup.sh b/bin/hbase-cleanup.sh
index cc5cc19..92b40cc 100755
--- a/bin/hbase-cleanup.sh
+++ b/bin/hbase-cleanup.sh
@@ -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
@@ -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;