From 9042f8f3784f10f695cba6b80c054695b1c152c5 Mon Sep 17 00:00:00 2001 From: Marcelo Vanzin Date: Fri, 8 May 2015 14:10:27 -0700 Subject: [MINOR] [CORE] Allow History Server to read kerberos opts from config file. Order of initialization code was wrong. Author: Marcelo Vanzin Closes #5998 from vanzin/hs-conf-fix and squashes the following commits: 00b6b6b [Marcelo Vanzin] [minor] [core] Allow History Server to read kerberos opts from config file. --- core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala index 50522e69dc..fc5182d369 100644 --- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala @@ -203,8 +203,8 @@ object HistoryServer extends Logging { def main(argStrings: Array[String]) { SignalLogger.register(log) - initSecurity() new HistoryServerArguments(conf, argStrings) + initSecurity() val securityManager = new SecurityManager(conf) val providerName = conf.getOption("spark.history.provider") -- cgit v1.2.3