Skip to content

SPARK-1686: keep schedule() calling in the main thread #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
CodingCat wants to merge 5 commits into from
Closed

SPARK-1686: keep schedule() calling in the main thread #639

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02b37ca
keep schedule() calling in the main thread
CodingCat May 5, 2014
ec9b7bb
address the comments
CodingCat May 5, 2014
36a2ac0
address Aaron's comments
CodingCat May 9, 2014
69e0a2a
style fix
CodingCat May 9, 2014
81bb4ca
rename variable
CodingCat May 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
keep schedule() calling in the main thread
  • Loading branch information
@CodingCat
CodingCat committed May 5, 2014
commit 02b37ca7e9256628e31cd56ba21d7e579c1233d6
4 changes: 3 additions & 1 deletion core/src/main/scala/org/apache/spark/deploy/master/Master.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ private[spark] class Master(
}
}

case TriggerSchedule => schedule()

case RevokedLeadership => {
logError("Leadership has been revoked -- master shutting down.")
System.exit(0)
Expand Down Expand Up @@ -448,7 +450,7 @@ private[spark] class Master(
}

state = RecoveryState.ALIVE
schedule()
self ! TriggerSchedule
logInfo("Recovery complete - resuming operations!")
}

Expand Down
2 changes: 2 additions & 0 deletions core/src/main/scala/org/apache/spark/deploy/master/MasterMessages.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ private[master] object MasterMessages {
case object RequestWebUIPort

case class WebUIPortResponse(webUIBoundPort: Int)

case object TriggerSchedule
Copy link
Contributor

@aarondav aarondav May 9, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is no longer used.

}