diff options
| author | Shixiong Zhu <shixiong@databricks.com> | 2017-02-09 11:16:51 -0800 |
|---|---|---|
| committer | Davies Liu <davies.liu@gmail.com> | 2017-02-09 11:16:51 -0800 |
| commit | 303f00a4bf6660dd83c8bd9e3a107bb3438a421b (patch) | |
| tree | df6209c244f94d4ea7782e1ace2b1099e8f50d58 /repl/scala-2.10/src/main | |
| parent | 6287c94f08200d548df5cc0a401b73b84f9968c4 (diff) | |
| download | spark-303f00a4bf6660dd83c8bd9e3a107bb3438a421b.tar.gz spark-303f00a4bf6660dd83c8bd9e3a107bb3438a421b.tar.bz2 spark-303f00a4bf6660dd83c8bd9e3a107bb3438a421b.zip | |
[SPARK-19481] [REPL] [MAVEN] Avoid to leak SparkContext in Signaling.cancelOnInterrupt
## What changes were proposed in this pull request?
`Signaling.cancelOnInterrupt` leaks a SparkContext per call and it makes ReplSuite unstable.
This PR adds `SparkContext.getActive` to allow `Signaling.cancelOnInterrupt` to get the active `SparkContext` to avoid the leak.
## How was this patch tested?
Jenkins
Author: Shixiong Zhu <shixiong@databricks.com>
Closes #16825 from zsxwing/SPARK-19481.
Diffstat (limited to 'repl/scala-2.10/src/main')
| -rw-r--r-- | repl/scala-2.10/src/main/scala/org/apache/spark/repl/Main.scala | 1 | ||||
| -rw-r--r-- | repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/Main.scala b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/Main.scala index 7b4e14bb6a..fba321be91 100644 --- a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/Main.scala +++ b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/Main.scala @@ -22,6 +22,7 @@ import org.apache.spark.internal.Logging object Main extends Logging { initializeLogIfNecessary(true) + Signaling.cancelOnInterrupt() private var _interp: SparkILoop = _ diff --git a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala index e017aa42a4..b7237a6ce8 100644 --- a/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala +++ b/repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala @@ -1027,7 +1027,6 @@ class SparkILoop( builder.getOrCreate() } sparkContext = sparkSession.sparkContext - Signaling.cancelOnInterrupt(sparkContext) sparkSession } |