Github user cloud-fan commented on a diff in the pull request:
https://github.com/apache/spark/pull/18172#discussion_r119724298
--- Diff: sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala
---
@@ -899,22 +899,14 @@ object SparkSession {
// No active nor global default session. Create a new one.
val sparkContext = userSuppliedContext.getOrElse {
- // set app name if not given
- val randomAppName = java.util.UUID.randomUUID().toString
val sparkConf = new SparkConf()
- options.foreach { case (k, v) => sparkConf.set(k, v) }
- if (!sparkConf.contains("spark.app.name")) {
- sparkConf.setAppName(randomAppName)
- }
- val sc = SparkContext.getOrCreate(sparkConf)
- // maybe this is an existing SparkContext, update its SparkConf
which maybe used
- // by SparkSession
- options.foreach { case (k, v) => sc.conf.set(k, v) }
- if (!sc.conf.contains("spark.app.name")) {
- sc.conf.setAppName(randomAppName)
- }
- sc
+ options.get("spark.master").foreach(sparkConf.setMaster)
+ // set a random app name if not given.
+ sparkConf.setAppName(options.getOrElse("spark.app.name",
+ java.util.UUID.randomUUID().toString))
+ SparkContext.getOrCreate(sparkConf)
}
+ options.foreach { case (k, v) => sparkContext.conf.set(k, v) }
--- End diff --
in order to remove
https://github.com/apache/spark/pull/18172/files#diff-d91c284798f1c98bf03a31855e26d71cL938
, here I change the behavior to also setting `options` to `sparkContext.conf`
even if the `sparkContext` is supplied by users. This change is safe as
`SparkSession.Builder.sparkContext` is private, and I checked all the callers
to confirm that it's ok to do so.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
