Skip to content

Commit

Permalink
HBASE-27244 bin/hbase still use slf4j-log4j while reload4j in place (a…
Browse files Browse the repository at this point in the history
…pache#4652)

Co-authored-by: Dong Li <dongaws@amazon.com>
Signed-off-by: Duo Zhang <zhangduo@apache.org>
(cherry picked from commit e157378)
Change-Id: I7928702aba6e79eb821a0ca9ed708bce7e48c52c
  • Loading branch information
2 people authored and Jenkins committed Aug 10, 2022
1 parent 78e216c commit 1d375e7
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions bin/hbase
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -645,7 +645,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
Expand Down Expand Up @@ -787,7 +787,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
Expand Down

0 comments on commit 1d375e7

Please sign in to comment.