Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
spark
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cs525-sp18-g07
spark
Commits
4af0d63c
Commit
4af0d63c
authored
11 years ago
by
Shivaram Venkataraman
Browse files
Options
Downloads
Patches
Plain Diff
Remove akka LogLevel fix as we no longer use spray
parent
d362d0f4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
core/src/main/scala/spark/SparkEnv.scala
+0
-2
0 additions, 2 deletions
core/src/main/scala/spark/SparkEnv.scala
core/src/main/scala/spark/deploy/LocalSparkCluster.scala
+0
-3
0 additions, 3 deletions
core/src/main/scala/spark/deploy/LocalSparkCluster.scala
with
0 additions
and
5 deletions
core/src/main/scala/spark/SparkEnv.scala
+
0
−
2
View file @
4af0d63c
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
core/src/main/scala/spark/deploy/LocalSparkCluster.scala
+
0
−
3
View file @
4af0d63c
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
())
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment