aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Vanzin <vanzin@cloudera.com>2015-05-08 14:10:27 -0700
committerAndrew Or <andrew@databricks.com>2015-05-08 14:10:27 -0700
commit9042f8f3784f10f695cba6b80c054695b1c152c5 (patch)
tree4c47cc165d90892090ecd14482d5d3230fb92ea9
parent3b0c5e71f156516fd8bbbeda70e69b487b0c1418 (diff)
downloadspark-9042f8f3784f10f695cba6b80c054695b1c152c5.tar.gz
spark-9042f8f3784f10f695cba6b80c054695b1c152c5.tar.bz2
spark-9042f8f3784f10f695cba6b80c054695b1c152c5.zip
[MINOR] [CORE] Allow History Server to read kerberos opts from config file.
Order of initialization code was wrong. Author: Marcelo Vanzin <vanzin@cloudera.com> 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.
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala2
1 files changed, 1 insertions, 1 deletions
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")