You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2019/11/20 21:09:13 UTC
[hadoop] branch branch-3.1 updated: HADOOP-15686. Supress bogus
AbstractWadlGeneratorGrammarGenerator in KMS stderr. Contributed by
Wei-Chiu Chuang.
This is an automated email from the ASF dual-hosted git repository.
weichiu pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git
View the commit online:
https://github.com/apache/hadoop/commit/0807cb24858e6e692db3e054f3f44986a2d6faf2
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 0807cb248 HADOOP-15686. Supress bogus AbstractWadlGeneratorGrammarGenerator in KMS stderr. Contributed by Wei-Chiu Chuang.
0807cb248 is described below
commit 0807cb24858e6e692db3e054f3f44986a2d6faf2
Author: Wei-Chiu Chuang <we...@apache.org>
AuthorDate: Mon Nov 18 13:50:07 2019 -0800
HADOOP-15686. Supress bogus AbstractWadlGeneratorGrammarGenerator in KMS stderr. Contributed by Wei-Chiu Chuang.
Reviewed-by: Xiaoyu Yao <xy...@apache.org>
(cherry picked from commit 9664b9c7a65d943e815c119e94234d3bf0b68dd4)
(cherry picked from commit bd2f79cfd8da9279acca826a86ea7bfcc8590bd1)
---
.../org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java | 6 ++++++
.../org/apache/hadoop/crypto/key/kms/server/TestKMS.java | 13 ++++++++++++-
.../hadoop-kms/src/test/resources/log4j.properties | 1 +
3 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
index 0640e25..da597b4 100644
--- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
+++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebApp.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.VersionInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.slf4j.bridge.SLF4JBridgeHandler;
@InterfaceAudience.Private
public class KMSWebApp implements ServletContextListener {
@@ -80,6 +81,11 @@ public class KMSWebApp implements ServletContextListener {
private static KMSAudit kmsAudit;
private static KeyProviderCryptoExtension keyProviderCryptoExtension;
+ static {
+ SLF4JBridgeHandler.removeHandlersForRootLogger();
+ SLF4JBridgeHandler.install();
+ }
+
@Override
public void contextInitialized(ServletContextEvent sce) {
try {
diff --git a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
index 694b6a8..00f81e3 100644
--- a/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
+++ b/hadoop-common-project/hadoop-kms/src/test/java/org/apache/hadoop/crypto/key/kms/server/TestKMS.java
@@ -614,7 +614,18 @@ public class TestKMS {
@Test
public void testStartStopHttpPseudo() throws Exception {
- testStartStop(false, false);
+ // Make sure bogus errors don't get emitted.
+ GenericTestUtils.LogCapturer logs =
+ GenericTestUtils.LogCapturer.captureLogs(LoggerFactory.getLogger(
+ "com.sun.jersey.server.wadl.generators.AbstractWadlGeneratorGrammarGenerator"));
+ try {
+ testStartStop(false, false);
+ } finally {
+ logs.stopCapturing();
+ }
+ assertFalse(logs.getOutput().contains(
+ "Couldn't find grammar element for class"));
+
}
@Test
diff --git a/hadoop-common-project/hadoop-kms/src/test/resources/log4j.properties b/hadoop-common-project/hadoop-kms/src/test/resources/log4j.properties
index e319af6..6984081 100644
--- a/hadoop-common-project/hadoop-kms/src/test/resources/log4j.properties
+++ b/hadoop-common-project/hadoop-kms/src/test/resources/log4j.properties
@@ -26,6 +26,7 @@ log4j.rootLogger=INFO, stdout
log4j.logger.org.apache.hadoop.conf=ERROR
log4j.logger.org.apache.hadoop.crytpo.key.kms.server=ALL
log4j.logger.com.sun.jersey.server.wadl.generators.WadlGeneratorJAXBGrammarGenerator=OFF
+log4j.logger.com.sun.jersey.server.wadl.generators.AbstractWadlGeneratorGrammarGenerator=OFF
log4j.logger.org.apache.hadoop.security=OFF
log4j.logger.org.apache.directory.server.core=OFF
log4j.logger.org.apache.hadoop.util.NativeCodeLoader=OFF
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org