Permalink
Browse files

Fix merge conflict since startUserClass now using runAsUser

  • Loading branch information...
1 parent 05eebed commit dfe3918265677a6208696a8cb82710203ee07c19 @tgravescs tgravescs committed Mar 6, 2014
@@ -90,6 +90,12 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
addAmIpFilter()
ApplicationMaster.register(this)
+
+ // Call this to force generation of secret so it gets populated into the
+ // hadoop UGI. This has to happen before the startUserClass which does a
+ // doAs in order for the credentials to be passed on to the worker containers.
+ val securityMgr = new SecurityManager(sparkConf)
+
// Start the user's JAR
userThread = startUserClass()
@@ -96,6 +96,11 @@ class ApplicationMaster(args: ApplicationMasterArguments, conf: Configuration,
ApplicationMaster.register(this)
+ // Call this to force generation of secret so it gets populated into the
+ // hadoop UGI. This has to happen before the startUserClass which does a
+ // doAs in order for the credentials to be passed on to the worker containers.
+ val securityMgr = new SecurityManager(sparkConf)
+
// Start the user's JAR
userThread = startUserClass()

0 comments on commit dfe3918

Please sign in to comment.