aboutsummaryrefslogtreecommitdiff
path: root/repl/scala-2.10
diff options
context:
space:
mode:
authorJakob Odersky <jakob@odersky.com>2016-04-21 22:04:08 -0700
committerDavies Liu <davies.liu@gmail.com>2016-04-21 22:04:08 -0700
commit80127935df06a829b734cafc2447aa1f3df40288 (patch)
tree03f1bfd290b6ba20c894e254603647e64b264b53 /repl/scala-2.10
parent3405cc775843a3a80d009d4f9079ba9daa2220e7 (diff)
downloadspark-80127935df06a829b734cafc2447aa1f3df40288.tar.gz
spark-80127935df06a829b734cafc2447aa1f3df40288.tar.bz2
spark-80127935df06a829b734cafc2447aa1f3df40288.zip
[SPARK-10001] [CORE] Interrupt tasks in repl with Ctrl+C
## What changes were proposed in this pull request? Improve signal handling to allow interrupting running tasks from the REPL (with Ctrl+C). If no tasks are running or Ctrl+C is pressed twice, the signal is forwarded to the default handler resulting in the usual termination of the application. This PR is a rewrite of -- and therefore closes #8216 -- as per piaozhexiu's request ## How was this patch tested? Signal handling is not easily testable therefore no unit tests were added. Nevertheless, the new functionality is implemented in a best-effort approach, soft-failing in case signals aren't available on a specific OS. Author: Jakob Odersky <jakob@odersky.com> Closes #12557 from jodersky/SPARK-10001-sigint.
Diffstat (limited to 'repl/scala-2.10')
-rw-r--r--repl/scala-2.10/src/main/scala/org/apache/spark/repl/SparkILoop.scala1
1 files changed, 1 insertions, 0 deletions
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 c5dc6ba221..8e7fc46e32 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
@@ -1022,6 +1022,7 @@ class SparkILoop(
}
sparkContext = new SparkContext(conf)
logInfo("Created spark context..")
+ Signaling.cancelOnInterrupt(sparkContext)
sparkContext
}