Skip to content

[SPARK-26482][CORE] Use ConfigEntry for hardcoded configs for ui categories #23423

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

[SPARK-26482][CORE] Use ConfigEntry for hardcoded configs for ui categories #23423

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8eeb9ed
[SPARK-26482][CORE] Use ConfigEntry for hardcoded configs for ui cate…
HeartSaVioR Dec 31, 2018
0ebe432
Address @kiszk review comment
HeartSaVioR Jan 7, 2019
5c4ced7
Address review comment from @vanzin
HeartSaVioR Jan 9, 2019
f5a5772
Also apply `.toSequence` to configurations in UI and History
HeartSaVioR Jan 10, 2019
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
Prev Previous commit
Next Next commit
Address review comment from @vanzin
  • Loading branch information
@HeartSaVioR
HeartSaVioR committed Jan 10, 2019
commit 5c4ced7caaa9be2bcb3e1dec31d7253ef9be03ad
3 changes: 2 additions & 1 deletion core/src/main/scala/org/apache/spark/internal/config/UI.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ private[spark] object UI {
val UI_FILTERS = ConfigBuilder("spark.ui.filters")
Copy link
Contributor

@vanzin vanzin Jan 8, 2019

Choose a reason for hiding this comment

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

This could use .toSequence too and clean up call sites a little bit.

Copy link
Contributor Author

@HeartSaVioR HeartSaVioR Jan 8, 2019

Choose a reason for hiding this comment

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

Thanks for the suggestion. Looks like others which are used along with stringToSet can be applied. I'll see which configurations can be applied and make changes.

.doc("Comma separated list of filter class names to apply to the Spark Web UI.")
.stringConf
.createOptional
.toSequence
.createWithDefault(Nil)

val UI_ALLOW_FRAMING_FROM = ConfigBuilder("spark.ui.allowFramingFrom")
.stringConf
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ private[spark] case class ServerInfo(
* of the chain to perform security-related functions.
*/
private def addFilters(handler: ServletContextHandler, securityMgr: SecurityManager): Unit = {
conf.get(UI_FILTERS).toSeq.flatMap(Utils.stringToSeq).foreach { filter =>
conf.get(UI_FILTERS).foreach { filter =>
logInfo(s"Adding filter to ${handler.getContextPath()}: $filter")
val oldParams = conf.getOption(s"spark.$filter.params").toSeq
.flatMap(Utils.stringToSeq)
Expand Down
2 changes: 1 addition & 1 deletion ...anagers/yarn/src/main/scala/org/apache/spark/scheduler/cluster/YarnSchedulerBackend.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ private[spark] abstract class YarnSchedulerBackend(
filterParams != null && filterParams.nonEmpty
if (hasFilter) {
// SPARK-26255: Append user provided filters(spark.ui.filters) with yarn filter.
val allFilters = filterName + "," + conf.get(UI_FILTERS).orElse(Some("")).get
val allFilters = Seq(filterName) ++ conf.get(UI_FILTERS)
logInfo(s"Add WebUI Filter. $filterName, $filterParams, $proxyBase")

// For already installed handlers, prepend the filter.
Expand Down