Repository: spark Updated Branches: refs/heads/master 0f576a574 -> 8e8bc9f95
[SPARK-11735][CORE][SQL] Add a check in the constructor of SQLContext/SparkSession to make sure its SparkContext is not stopped ## What changes were proposed in this pull request? Add a check in the constructor of SQLContext/SparkSession to make sure its SparkContext is not stopped. ## How was this patch tested? Jenkins unit tests. Author: Shixiong Zhu <shixi...@databricks.com> Closes #13154 from zsxwing/check-spark-context-stop. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/8e8bc9f9 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/8e8bc9f9 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/8e8bc9f9 Branch: refs/heads/master Commit: 8e8bc9f957de6c0aefbc6ef4b18c421b486477a6 Parents: 0f576a5 Author: Shixiong Zhu <shixi...@databricks.com> Authored: Tue May 17 14:57:21 2016 -0700 Committer: Yin Huai <yh...@databricks.com> Committed: Tue May 17 14:57:21 2016 -0700 ---------------------------------------------------------------------- core/src/main/scala/org/apache/spark/SparkContext.scala | 2 +- sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala | 2 ++ sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/8e8bc9f9/core/src/main/scala/org/apache/spark/SparkContext.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala index e391599..e6cdd0d 100644 --- a/core/src/main/scala/org/apache/spark/SparkContext.scala +++ b/core/src/main/scala/org/apache/spark/SparkContext.scala @@ -94,7 +94,7 @@ class SparkContext(config: SparkConf) extends Logging with ExecutorAllocationCli private[spark] val stopped: AtomicBoolean = new AtomicBoolean(false) - private def assertNotStopped(): Unit = { + private[spark] def assertNotStopped(): Unit = { if (stopped.get()) { val activeContext = SparkContext.activeContext.get() val activeCreationSite = http://git-wip-us.apache.org/repos/asf/spark/blob/8e8bc9f9/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala index c64e284..4451188 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SQLContext.scala @@ -67,6 +67,8 @@ class SQLContext private[sql]( self => + sparkSession.sparkContext.assertNotStopped() + // Note: Since Spark 2.0 this class has become a wrapper of SparkSession, where the // real functionality resides. This class remains mainly for backward compatibility. http://git-wip-us.apache.org/repos/asf/spark/blob/8e8bc9f9/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala ---------------------------------------------------------------------- diff --git a/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala b/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala index 3016437..da575c7 100644 --- a/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala +++ b/sql/core/src/main/scala/org/apache/spark/sql/SparkSession.scala @@ -68,6 +68,7 @@ class SparkSession private( this(sc, None) } + sparkContext.assertNotStopped() /* ----------------------- * | Session-related state | --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
