HBASE-27244 bin/hbase still use slf4j-log4j while reload4j in place (#4652)

Co-authored-by: Dong Li <dongaws@amazon.com>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
This commit is contained in:
alexdongli0829 2022-08-10 18:13:09 +10:00 committed by GitHub
parent ae8652cdbd
commit e157378524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

View File

@ -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