You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by zh...@apache.org on 2020/05/12 04:03:42 UTC
[hbase] branch master updated (bb3191c -> 8601416)
This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git.
from bb3191c HBASE-24338 [Flakey Tests] NPE in TestRaceBetweenSCPAndDTP Addendum2: make same fix for TestRaceBetweenSCPAndTRSP but in a second place (addendum 1 got first place).
add 8601416 HBASE-24309 Avoid introducing log4j and slf4j-log4j dependencies for modules other than hbase-assembly (#1640)
No new revisions were added by this update.
Summary of changes:
hbase-archetypes/hbase-client-project/pom.xml | 16 +-
.../hbase-shaded-client-project/pom.xml | 13 +-
hbase-assembly/pom.xml | 21 +++
hbase-assembly/src/main/assembly/client.xml | 42 +++--
.../src/main/assembly/hadoop-three-compat.xml | 3 +
hbase-asyncfs/pom.xml | 26 +++
hbase-asyncfs/src/test/resources/log4j.properties | 68 --------
hbase-backup/pom.xml | 23 ++-
.../apache/hadoop/hbase/backup/BackupDriver.java | 9 +-
.../org/apache/hadoop/hbase/backup/LogUtils.java | 48 ------
.../apache/hadoop/hbase/backup/RestoreDriver.java | 7 +-
hbase-backup/src/test/resources/log4j.properties | 68 --------
hbase-balancer/pom.xml | 20 +++
hbase-client/pom.xml | 21 +++
hbase-client/src/test/resources/log4j.properties | 68 --------
hbase-common/pom.xml | 28 ++-
.../hadoop/hbase/logging/TestLog4jUtils.java | 71 ++++++++
hbase-common/src/test/resources/log4j.properties | 68 --------
hbase-endpoint/pom.xml | 26 +++
hbase-examples/pom.xml | 26 +++
hbase-examples/src/test/resources/log4j.properties | 69 --------
hbase-hadoop-compat/pom.xml | 27 ++-
hbase-hbtop/pom.xml | 26 +++
hbase-http/pom.xml | 20 ++-
.../org/apache/hadoop/hbase/http/log/LogLevel.java | 54 ++----
.../apache/hadoop/hbase/util}/LogMonitoring.java | 30 +---
hbase-http/src/test/resources/log4j.properties | 68 --------
hbase-it/pom.xml | 23 ++-
hbase-logging/pom.xml | 92 ++++++++++
.../apache/hadoop/hbase/AsyncConsoleAppender.java | 11 +-
.../hadoop/hbase/logging/InternalLog4jUtils.java | 70 ++++++++
.../apache/hadoop/hbase/logging/Log4jUtils.java | 121 +++++++++++++
.../src/test/resources/log4j.properties | 0
hbase-mapreduce/pom.xml | 30 +++-
.../util/MapreduceDependencyClasspathTool.java | 10 +-
.../src/test/resources/log4j.properties | 68 --------
hbase-metrics-api/pom.xml | 26 +++
hbase-metrics/pom.xml | 26 +++
hbase-procedure/pom.xml | 26 +++
.../src/test/resources/log4j.properties | 68 --------
hbase-replication/pom.xml | 26 +++
hbase-rest/pom.xml | 26 +++
hbase-rest/src/test/resources/log4j.properties | 69 --------
hbase-server/pom.xml | 43 +++--
.../hadoop/hbase/master/MasterDumpServlet.java | 2 +-
.../hadoop/hbase/regionserver/RSDumpServlet.java | 7 +-
.../apache/hadoop/hbase/HBaseTestingUtility.java | 23 +--
hbase-server/src/test/resources/log4j.properties | 72 --------
hbase-shaded/pom.xml | 5 +-
hbase-shell/pom.xml | 26 +++
hbase-testing-util/pom.xml | 23 +++
hbase-thrift/pom.xml | 26 +++
hbase-zookeeper/pom.xml | 30 +++-
.../src/test/resources/log4j.properties | 68 --------
pom.xml | 191 ++++++++++++++++++---
55 files changed, 1175 insertions(+), 999 deletions(-)
delete mode 100644 hbase-asyncfs/src/test/resources/log4j.properties
delete mode 100644 hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/LogUtils.java
delete mode 100644 hbase-backup/src/test/resources/log4j.properties
delete mode 100644 hbase-client/src/test/resources/log4j.properties
create mode 100644 hbase-common/src/test/java/org/apache/hadoop/hbase/logging/TestLog4jUtils.java
delete mode 100644 hbase-common/src/test/resources/log4j.properties
delete mode 100644 hbase-examples/src/test/resources/log4j.properties
rename {hbase-server/src/main/java/org/apache/hadoop/hbase/monitoring => hbase-http/src/main/java/org/apache/hadoop/hbase/util}/LogMonitoring.java (75%)
delete mode 100644 hbase-http/src/test/resources/log4j.properties
create mode 100644 hbase-logging/pom.xml
rename {hbase-common => hbase-logging}/src/main/java/org/apache/hadoop/hbase/AsyncConsoleAppender.java (79%)
create mode 100644 hbase-logging/src/main/java/org/apache/hadoop/hbase/logging/InternalLog4jUtils.java
create mode 100644 hbase-logging/src/main/java/org/apache/hadoop/hbase/logging/Log4jUtils.java
rename {hbase-shell => hbase-logging}/src/test/resources/log4j.properties (100%)
delete mode 100644 hbase-mapreduce/src/test/resources/log4j.properties
delete mode 100644 hbase-procedure/src/test/resources/log4j.properties
delete mode 100644 hbase-rest/src/test/resources/log4j.properties
delete mode 100644 hbase-server/src/test/resources/log4j.properties
delete mode 100644 hbase-zookeeper/src/test/resources/log4j.properties