From e157378524e1c7f84006355beab71f5b8110a7f2 Mon Sep 17 00:00:00 2001 From: alexdongli0829 <40448063+alexdongli0829@users.noreply.github.com> Date: Wed, 10 Aug 2022 18:13:09 +1000 Subject: [PATCH] HBASE-27244 bin/hbase still use slf4j-log4j while reload4j in place (#4652) Co-authored-by: Dong Li Signed-off-by: Duo Zhang --- bin/hbase | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/hbase b/bin/hbase index d306ed069d6..3c8f80bf4e2 100755 --- a/bin/hbase +++ b/bin/hbase @@ -304,7 +304,7 @@ fi for f in "${HBASE_HOME}"/lib/client-facing-thirdparty/*.jar; do if [[ ! "${f}" =~ ^.*/htrace-core-3.*\.jar$ ]] && \ [ "${f}" != "htrace-core.jar$" ] && \ - [[ ! "${f}" =~ ^.*/slf4j-log4j.*$ ]]; then + [[ ! "${f}" =~ ^.*/slf4j-reload4j.*$ ]]; then CLASSPATH="${CLASSPATH}:${f}" fi done @@ -641,7 +641,7 @@ elif [ "$COMMAND" = "mapredcp" ] ; then for f in "${HBASE_HOME}"/lib/client-facing-thirdparty/*.jar; do if [[ ! "${f}" =~ ^.*/htrace-core-3.*\.jar$ ]] && \ [ "${f}" != "htrace-core.jar$" ] && \ - [[ ! "${f}" =~ ^.*/slf4j-log4j.*$ ]]; then + [[ ! "${f}" =~ ^.*/slf4j-reload4j.*$ ]]; then echo -n ":${f}" fi done @@ -780,7 +780,7 @@ fi HEAP_SETTINGS="$JAVA_HEAP_MAX $JAVA_OFFHEAP_MAX" # by now if we're running a command it means we need logging -for f in ${HBASE_HOME}/lib/client-facing-thirdparty/slf4j-log4j*.jar; do +for f in ${HBASE_HOME}/lib/client-facing-thirdparty/slf4j-reload4j*.jar; do if [ -f "${f}" ]; then CLASSPATH="${CLASSPATH}:${f}" break