From 2b550a521e45e1dbca2cca40ddd94e20c013831c Mon Sep 17 00:00:00 2001
From: Ilya Ganelin <ilya.ganelin@capitalone.com>
Date: Wed, 10 Jun 2015 11:21:12 -0700
Subject: [PATCH] [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
---
core/src/main/scala/org/apache/spark/SparkEnv.scala | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/core/src/main/scala/org/apache/spark/SparkEnv.scala b/core/src/main/scala/org/apache/spark/SparkEnv.scala
index a185954089..b0665570e2 100644
--- a/core/src/main/scala/org/apache/spark/SparkEnv.scala
+++ b/core/src/main/scala/org/apache/spark/SparkEnv.scala
@@ -20,6 +20,8 @@ package org.apache.spark
import java.io.File
import java.net.Socket
+import akka.actor.ActorSystem
+
import scala.collection.JavaConversions._
import scala.collection.mutable
import scala.util.Properties
@@ -75,7 +77,8 @@ class SparkEnv (
val conf: SparkConf) extends Logging {
// 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 val pythonWorkers = mutable.HashMap[(String, Map[String, String]), PythonWorkerFactory]()
--
GitLab