Skip to content
Snippets Groups Projects
Commit 2b550a52 authored by Ilya Ganelin's avatar Ilya Ganelin Committed by Reynold Xin
Browse files

[SPARK-7996] Deprecate the developer api SparkEnv.actorSystem

Changed ```SparkEnv.actorSystem``` to be a function such that we can use the deprecated flag with it and added a deprecated message.

Author: Ilya Ganelin <ilya.ganelin@capitalone.com>

Closes #6731 from ilganeli/SPARK-7996 and squashes the following commits:

be43817 [Ilya Ganelin] Restored to val
9ed89e7 [Ilya Ganelin] Added a version info for deprecation
9610b08 [Ilya Ganelin] Converted actorSystem to function and added deprecated flag
parent c6ba7cca
No related branches found
No related tags found
No related merge requests found
...@@ -20,6 +20,8 @@ package org.apache.spark ...@@ -20,6 +20,8 @@ package org.apache.spark
import java.io.File import java.io.File
import java.net.Socket import java.net.Socket
import akka.actor.ActorSystem
import scala.collection.JavaConversions._ import scala.collection.JavaConversions._
import scala.collection.mutable import scala.collection.mutable
import scala.util.Properties import scala.util.Properties
...@@ -75,7 +77,8 @@ class SparkEnv ( ...@@ -75,7 +77,8 @@ class SparkEnv (
val conf: SparkConf) extends Logging { val conf: SparkConf) extends Logging {
// TODO Remove actorSystem // TODO Remove actorSystem
val actorSystem = rpcEnv.asInstanceOf[AkkaRpcEnv].actorSystem @deprecated("Actor system is no longer supported as of 1.4")
val actorSystem: ActorSystem = rpcEnv.asInstanceOf[AkkaRpcEnv].actorSystem
private[spark] var isStopped = false private[spark] var isStopped = false
private val pythonWorkers = mutable.HashMap[(String, Map[String, String]), PythonWorkerFactory]() private val pythonWorkers = mutable.HashMap[(String, Map[String, String]), PythonWorkerFactory]()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment