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
The following commit(s) were added to refs/heads/branch-3.1 by this push: new 286c94f HDFS-15097. Purge log in KMS and HttpFS. Contributed by Doris Gu. 286c94f is described below commit 286c94f13d64fd330b587306e1ada019b30f5b7d Author: Wei-Chiu Chuang <weic...@apache.org> AuthorDate: Mon Jan 13 10:48:53 2020 -0800 HDFS-15097. Purge log in KMS and HttpFS. Contributed by Doris Gu. (cherry picked from commit 6b86a5110e4b3f45bf55f97bd402680bf26cefb9) (cherry picked from commit aa3c96474f52fba01d999fa75880e0948affbb01) --- .../java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java | 7 ++----- .../org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java index 036231d..7cfc010 100644 --- a/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java +++ b/hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java @@ -24,7 +24,6 @@ import java.net.URI; import java.net.URL; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.conf.ConfigurationWithLogging; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.http.HttpServer2; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; @@ -168,10 +167,8 @@ public class KMSWebServer { public static void main(String[] args) throws Exception { KMSConfiguration.initLogging(); StringUtils.startupShutdownMessage(KMSWebServer.class, args, LOG); - Configuration conf = new ConfigurationWithLogging( - KMSConfiguration.getKMSConf()); - Configuration sslConf = new ConfigurationWithLogging( - SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER)); + Configuration conf = KMSConfiguration.getKMSConf(); + Configuration sslConf = SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER); KMSWebServer kmsWebServer = new KMSWebServer(conf, sslConf); kmsWebServer.start(); kmsWebServer.join(); diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java index 39f1caf..340fccc 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java @@ -26,7 +26,6 @@ import java.net.URI; import java.net.URL; import org.apache.hadoop.classification.InterfaceAudience; -import org.apache.hadoop.conf.ConfigurationWithLogging; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.http.HttpServer2; import org.apache.hadoop.security.authorize.AccessControlList; @@ -156,10 +155,8 @@ public class HttpFSServerWebServer { public static void main(String[] args) throws Exception { startupShutdownMessage(HttpFSServerWebServer.class, args, LOG); - Configuration conf = new ConfigurationWithLogging( - new Configuration(true)); - Configuration sslConf = new ConfigurationWithLogging( - SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER)); + Configuration conf = new Configuration(true); + Configuration sslConf = SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER); HttpFSServerWebServer webServer = new HttpFSServerWebServer(conf, sslConf); webServer.start(); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org