Skip to content

[SPARK-23608][CORE][WebUI] Add synchronization in SHS between attachSparkUI and detachSparkUI functions to avoid concurrent modification issue to Jetty Handlers #20744

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
zhouyejoe wants to merge 4 commits into from
Closed

[SPARK-23608][CORE][WebUI] Add synchronization in SHS between attachSparkUI and detachSparkUI functions to avoid concurrent modification issue to Jetty Handlers #20744

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f4118c0
[SPARK-23608][CORE][WebUI] Add synchronization in SHS between attachS…
zhouyejoe Mar 6, 2018
45f66a4
Fix the Scala style check issue
zhouyejoe Mar 8, 2018
cd7e1f6
Fine grain synchronization on handlers only for better performance.
zhouyejoe Mar 12, 2018
963c7b3
Move addfilters to handlers into synchronized block
zhouyejoe Mar 14, 2018
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
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,14 @@ class HistoryServer(
appId: String,
attemptId: Option[String],
ui: SparkUI,
completed: Boolean) {
completed: Boolean) = this.synchronized {
assert(serverInfo.isDefined, "HistoryServer must be bound before attaching SparkUIs")
ui.getHandlers.foreach(attachHandler)
addFilters(ui.getHandlers, conf)

@jiangxb1987 jiangxb1987 Mar 13, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

shall we also keep handlers synchronized for this line?

@zhouyejoe zhouyejoe Mar 14, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes. Thanks for catching this. Will update.

}

/** Detach a reconstructed UI from this server. Only valid after bind(). */
override def detachSparkUI(appId: String, attemptId: Option[String], ui: SparkUI): Unit = {
override def detachSparkUI(appId: String, attemptId: Option[String], ui: SparkUI): Unit = this.synchronized {

@vanzin vanzin Mar 6, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I'll trigger tests but this will cause a style violation.

@zhouyejoe zhouyejoe Mar 6, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Thanks. Will fix the style violation.

assert(serverInfo.isDefined, "HistoryServer must be bound before detaching SparkUIs")
ui.getHandlers.foreach(detachHandler)
provider.onUIDetached(appId, attemptId, ui)
Expand Down