You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@toree.apache.org by ch...@apache.org on 2016/06/08 03:56:27 UTC
incubator-toree git commit: Removing redundant code from kernel
bootstrap
Repository: incubator-toree
Updated Branches:
refs/heads/master 05b698c1b -> ccb3d5d5b
Removing redundant code from kernel bootstrap
Project: http://git-wip-us.apache.org/repos/asf/incubator-toree/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-toree/commit/ccb3d5d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-toree/tree/ccb3d5d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-toree/diff/ccb3d5d5
Branch: refs/heads/master
Commit: ccb3d5d5bf40ed4148a34ee97d95c7f9b325e8b1
Parents: 05b698c
Author: Liam Fisk <li...@orionhealth.com>
Authored: Tue Jun 7 11:06:23 2016 +1200
Committer: Liam Fisk <li...@orionhealth.com>
Committed: Wed Jun 8 07:43:32 2016 +1200
----------------------------------------------------------------------
.../main/scala/org/apache/toree/boot/KernelBootstrap.scala | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-toree/blob/ccb3d5d5/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
----------------------------------------------------------------------
diff --git a/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala b/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
index 46603bb..33e265f 100644
--- a/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
+++ b/kernel/src/main/scala/org/apache/toree/boot/KernelBootstrap.scala
@@ -19,7 +19,6 @@ package org.apache.toree.boot
import akka.actor.{ActorRef, ActorSystem}
import com.typesafe.config.Config
-import org.apache.spark.SparkContext
import org.apache.toree.boot.layer._
import org.apache.toree.interpreter.Interpreter
import org.apache.toree.kernel.api.Kernel
@@ -45,7 +44,6 @@ class KernelBootstrap(config: Config) extends LogLike {
private var statusDispatch: ActorRef = _
private var kernel: Kernel = _
- private var sparkContext: SparkContext = _
private var interpreters: Seq[Interpreter] = Nil
/**
@@ -91,7 +89,6 @@ class KernelBootstrap(config: Config) extends LogLike {
appName = DefaultAppName,
actorLoader = actorLoader
)
- //this.sparkContext = sparkContext
this.interpreters ++= Seq(interpreter)
this.kernel = kernel
@@ -127,11 +124,6 @@ class KernelBootstrap(config: Config) extends LogLike {
* Shuts down all kernel systems.
*/
def shutdown() = {
- logger.info("Shutting down Spark Context")
- Try(kernel.sparkContext.stop()).failed.foreach(
- logger.error("Failed to shutdown Spark Context", _: Throwable)
- )
-
logger.info("Shutting down interpreters")
Try(interpreters.foreach(_.stop())).failed.foreach(
logger.error("Failed to shutdown interpreters", _: Throwable)
@@ -171,4 +163,3 @@ class KernelBootstrap(config: Config) extends LogLike {
logger.info("ZeroMQ (JeroMQ) version: " + ZMQ.getVersionString)
}
}
-