HBASE-26030 hbase-cleanup.sh did not clean the wal dir if hbase.wal.dir configured individually (#3432)
Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
parent
7aa0dfa4a8
commit
b80d70cd53
|
@ -57,6 +57,8 @@ if [ "$zparent" == "null" ]; then zparent="/hbase"; fi
|
||||||
hrootdir=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.rootdir`
|
hrootdir=`$bin/hbase org.apache.hadoop.hbase.util.HBaseConfTool hbase.rootdir`
|
||||||
if [ "$hrootdir" == "null" ]; then hrootdir="file:///tmp/hbase-${USER}/hbase"; fi
|
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() {
|
check_for_znodes() {
|
||||||
command=$1;
|
command=$1;
|
||||||
case $command in
|
case $command in
|
||||||
|
@ -102,10 +104,16 @@ clean_up() {
|
||||||
;;
|
;;
|
||||||
--cleanHdfs)
|
--cleanHdfs)
|
||||||
execute_hdfs_command "-rm -R ${hrootdir}"
|
execute_hdfs_command "-rm -R ${hrootdir}"
|
||||||
|
if [ "${hbasewaldir}" != "null" ]; then
|
||||||
|
execute_hdfs_command "-rm -R ${hbasewaldir}"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
--cleanAll)
|
--cleanAll)
|
||||||
execute_zk_command "deleteall ${zparent}";
|
execute_zk_command "deleteall ${zparent}";
|
||||||
execute_hdfs_command "-rm -R ${hrootdir}"
|
execute_hdfs_command "-rm -R ${hrootdir}"
|
||||||
|
if [ "${hbasewaldir}" != "null" ]; then
|
||||||
|
execute_hdfs_command "-rm -R ${hbasewaldir}"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
--cleanAcls)
|
--cleanAcls)
|
||||||
execute_clean_acls;
|
execute_clean_acls;
|
||||||
|
|
Loading…
Reference in New Issue