Skip to content
Snippets Groups Projects
Commit 4af0d63c authored by Shivaram Venkataraman's avatar Shivaram Venkataraman
Browse files

Remove akka LogLevel fix as we no longer use spray

parent d362d0f4
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,6 @@ import serializer.Serializer
import akka.actor.{Actor, ActorRef, Props, ActorSystemImpl, ActorSystem}
import akka.remote.RemoteActorRefProvider
import akka.event.{Logging => AkkaLogging}
import spark.broadcast.BroadcastManager
import spark.storage.BlockManager
......@@ -52,7 +51,6 @@ class SparkEnv (
broadcastManager.stop()
blockManager.stop()
blockManager.master.stop()
actorSystem.eventStream.setLogLevel(AkkaLogging.ErrorLevel)
actorSystem.shutdown()
// Unfortunately Akka's awaitTermination doesn't actually wait for the Netty server to shut
// down, but let's call it anyway in case it gets fixed in a later release
......
package spark.deploy
import akka.actor.{ActorRef, Props, Actor, ActorSystem, Terminated}
import akka.event.{Logging => AkkaLogging}
import spark.deploy.worker.Worker
import spark.deploy.master.Master
......@@ -44,11 +43,9 @@ class LocalSparkCluster(numWorkers: Int, coresPerWorker: Int, memoryPerWorker: I
def stop() {
logInfo("Shutting down local Spark cluster.")
// Stop the workers before the master so they don't get upset that it disconnected
workerActorSystems.foreach(_.eventStream.setLogLevel(AkkaLogging.ErrorLevel))
workerActorSystems.foreach(_.shutdown())
workerActorSystems.foreach(_.awaitTermination())
masterActorSystems.foreach(_.eventStream.setLogLevel(AkkaLogging.ErrorLevel))
masterActorSystems.foreach(_.shutdown())
masterActorSystems.foreach(_.awaitTermination())
}
......
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