Skip to content

[SPARK-38175][CORE][FOLLOWUP] Remove urlPattern from HistoryAppStatusStore#replaceLogUrls method signature #35567

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
LuciferYang wants to merge 3 commits into from
Closed

[SPARK-38175][CORE][FOLLOWUP] Remove urlPattern from HistoryAppStatusStore#replaceLogUrls method signature #35567

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a64a72
fix HistoryAppStatusStore
LuciferYang Feb 18, 2022
6be9cbf
use logUrlPattern.nonEmpty
LuciferYang Feb 18, 2022
d9921b2
use logUrlPattern.nonEmpty
LuciferYang Feb 18, 2022
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
11 changes: 6 additions & 5 deletions core/src/main/scala/org/apache/spark/deploy/history/HistoryAppStatusStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,21 @@ private[spark] class HistoryAppStatusStore(
override def executorList(activeOnly: Boolean): Seq[v1.ExecutorSummary] = {
val execList = super.executorList(activeOnly)
logUrlPattern match {
case Some(pattern) => execList.map(replaceLogUrls(_, pattern))
case Some(_) => execList.map(replaceLogUrls)

@srowen srowen Feb 18, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Here too?

@LuciferYang LuciferYang Feb 18, 2022

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.

Sorry, let me fix this too

@LuciferYang LuciferYang Feb 18, 2022

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.

done

case None => execList
}
}

override def executorSummary(executorId: String): v1.ExecutorSummary = {
val execSummary = super.executorSummary(executorId)
logUrlPattern match {
case Some(pattern) => replaceLogUrls(execSummary, pattern)
case None => execSummary
if (logUrlPattern.nonEmpty) {
replaceLogUrls(execSummary)
} else {
execSummary
}
}

private def replaceLogUrls(exec: v1.ExecutorSummary, urlPattern: String): v1.ExecutorSummary = {

@LuciferYang LuciferYang Feb 18, 2022 •
edited
Loading

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.

SPARK-26311 defines this method with urlPattern and SPARK-26792 change to use logUrlPattern held by ExecutorLogUrlHandler

private def replaceLogUrls(exec: v1.ExecutorSummary): v1.ExecutorSummary = {
val newLogUrlMap = logUrlHandler.applyPattern(exec.executorLogs, exec.attributes)
replaceExecutorLogs(exec, newLogUrlMap)
}
Expand Down