diff options
| -rw-r--r-- | core/src/main/scala/org/apache/spark/SparkContext.scala | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index fc7ea51ab0..4f3bb1c877 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -2262,9 +2262,10 @@ object SparkContext extends Logging { SPARK_CONTEXT_CONSTRUCTOR_LOCK.synchronized { if (activeContext.get() == null) { setActiveContext(new SparkContext(config), allowMultipleContexts = false) - } - if (config.getAll.nonEmpty) { - logWarning("Use an existing SparkContext, some configuration may not take effect.") + } else { + if (config.getAll.nonEmpty) { + logWarning("Using an existing SparkContext; some configuration may not take effect.") + } } activeContext.get() } @@ -2281,7 +2282,12 @@ object SparkContext extends Logging { * even if multiple contexts are allowed. */ def getOrCreate(): SparkContext = { - getOrCreate(new SparkConf()) + SPARK_CONTEXT_CONSTRUCTOR_LOCK.synchronized { + if (activeContext.get() == null) { + setActiveContext(new SparkContext(), allowMultipleContexts = false) + } + activeContext.get() + } } /** |