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

(cherry picked from commit 6b86a5110e)
This commit is contained in:
Wei-Chiu Chuang 2020-01-13 10:48:53 -08:00
parent 6a7dfb3bf3
commit aa3c96474f
2 changed files with 4 additions and 10 deletions

View File

@ -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();

View File

@ -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();