Skip to content

[SPARK-26895][CORE] prepareSubmitEnvironment should be called within doAs for proxy users #23806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
abellina wants to merge 2 commits into from
Closed

[SPARK-26895][CORE] prepareSubmitEnvironment should be called within doAs for proxy users #23806

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f082fc6
SPARK-26895: prepareSubmitEnvironment should be called within doAs fo…
Feb 15, 2019
224d489
SPARK-26895: update comments
abellina Feb 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 14 additions & 18 deletions core/src/main/scala/org/apache/spark/deploy/SparkSubmit.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,11 @@ private[spark] class SparkSubmit extends Logging {
}

/**
* Submit the application using the provided parameters.
*
* This runs in two steps. First, we prepare the launch environment by setting up
* the appropriate classpath, system properties, and application arguments for
* running the child main class based on the cluster manager and the deploy mode.
* Second, we use this launch environment to invoke the main method of the child
* main class.
* Submit the application using the provided parameters, ensuring to first wrap
* in a doAs when --proxy-user is specified.
*/
@tailrec
private def submit(args: SparkSubmitArguments, uninitLog: Boolean): Unit = {
val (childArgs, childClasspath, sparkConf, childMainClass) = prepareSubmitEnvironment(args)

def doRunMain(): Unit = {
if (args.proxyUser != null) {
Expand All @@ -150,7 +144,7 @@ private[spark] class SparkSubmit extends Logging {
try {
proxyUser.doAs(new PrivilegedExceptionAction[Unit]() {
override def run(): Unit = {
runMain(childArgs, childClasspath, sparkConf, childMainClass, args.verbose)
runMain(args)
}
})
} catch {
Expand All @@ -165,7 +159,7 @@ private[spark] class SparkSubmit extends Logging {
}
}
} else {
runMain(childArgs, childClasspath, sparkConf, childMainClass, args.verbose)
runMain(args)
}
}

Expand Down Expand Up @@ -774,18 +768,20 @@ private[spark] class SparkSubmit extends Logging {
}

/**
* Run the main method of the child class using the provided launch environment.
* Run the main method of the child class using the submit arguments.
*
* This runs in two steps. First, we prepare the launch environment by setting up
* the appropriate classpath, system properties, and application arguments for
* running the child main class based on the cluster manager and the deploy mode.
* Second, we use this launch environment to invoke the main method of the child
* main class.
*
* Note that this main class will not be the one provided by the user if we're
* running cluster deploy mode or python applications.
*/
private def runMain(
childArgs: Seq[String],
childClasspath: Seq[String],
sparkConf: SparkConf,
childMainClass: String,
verbose: Boolean): Unit = {
if (verbose) {
private def runMain(args: SparkSubmitArguments): Unit = {
val (childArgs, childClasspath, sparkConf, childMainClass) = prepareSubmitEnvironment(args)
if (args.verbose) {
logInfo(s"Main class:\n$childMainClass")
logInfo(s"Arguments:\n${childArgs.mkString("\n")}")
// sysProps may contain sensitive information, so redact before printing
Expand Down