Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-15097. Purge log in KMS and HttpFS. Contributed by Doris Gu.

This commit is contained in:
Wei-Chiu Chuang 2020-01-13 10:48:53 -08:00
parent 621c5eac38
commit 6b86a5110e
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hadoop-common-project/hadoop-kms/src/main/java/org/apache/hadoop/crypto/key/kms/server/KMSWebServer.java
View File

@ -24,7 +24,6 @@ import java.net.URI;
import java.net.URL; import java.net.URL;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.ConfigurationWithLogging;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.http.HttpServer2; import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem; import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
@ -168,10 +167,8 @@ public class KMSWebServer {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
KMSConfiguration.initLogging(); KMSConfiguration.initLogging();
StringUtils.startupShutdownMessage(KMSWebServer.class, args, LOG); StringUtils.startupShutdownMessage(KMSWebServer.class, args, LOG);
Configuration conf = new ConfigurationWithLogging( Configuration conf = KMSConfiguration.getKMSConf();
KMSConfiguration.getKMSConf()); Configuration sslConf = SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER);
Configuration sslConf = new ConfigurationWithLogging(
SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER));
KMSWebServer kmsWebServer = new KMSWebServer(conf, sslConf); KMSWebServer kmsWebServer = new KMSWebServer(conf, sslConf);
kmsWebServer.start(); kmsWebServer.start();
kmsWebServer.join(); kmsWebServer.join();

7
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
View File

@ -28,7 +28,6 @@ import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.ConfigurationWithLogging;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.http.HttpServer2; import org.apache.hadoop.http.HttpServer2;
import org.apache.hadoop.security.AuthenticationFilterInitializer; import org.apache.hadoop.security.AuthenticationFilterInitializer;
@ -178,10 +177,8 @@ public class HttpFSServerWebServer {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
startupShutdownMessage(HttpFSServerWebServer.class, args, LOG); startupShutdownMessage(HttpFSServerWebServer.class, args, LOG);
Configuration conf = new ConfigurationWithLogging( Configuration conf = new Configuration(true);
new Configuration(true)); Configuration sslConf = SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER);
Configuration sslConf = new ConfigurationWithLogging(
SSLFactory.readSSLConfiguration(conf, SSLFactory.Mode.SERVER));
HttpFSServerWebServer webServer = HttpFSServerWebServer webServer =
new HttpFSServerWebServer(conf, sslConf); new HttpFSServerWebServer(conf, sslConf);
webServer.start(); webServer.start();