Skip to content

[SPARK-8981][CORE][FOLLOW-UP] Clean up MDC properties after running a task #28756

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

[SPARK-8981][CORE][FOLLOW-UP] Clean up MDC properties after running a task #28756

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe27f88
fix
Ngone51 Jun 8, 2020
be3d752
remove setMDC
Ngone51 Jun 8, 2020
0cefc61
address comments
Ngone51 Jun 11, 2020
2f1b86b
clear MDC at the beginning
Ngone51 Jun 11, 2020
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
23 changes: 17 additions & 6 deletions core/src/main/scala/org/apache/spark/executor/Executor.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,9 +401,15 @@ private[spark] class Executor(
}

override def run(): Unit = {
try {
setMDCForTask(taskName, mdcProperties)
runInternal()
} finally {
MDC.clear()
}
}

setMDCForTask(taskName, mdcProperties)

private def runInternal(): Unit = {
threadId = Thread.currentThread.getId
Thread.currentThread.setName(threadName)
val threadMXBean = ManagementFactory.getThreadMXBean
Expand Down Expand Up @@ -703,11 +709,10 @@ private[spark] class Executor(
}

private def setMDCForTask(taskName: String, mdc: Seq[(String, String)]): Unit = {
MDC.put("taskName", taskName)

mdc.foreach { case (key, value) =>
MDC.put(key, value)
}
MDC.put("taskName", taskName)
}

/**
Expand Down Expand Up @@ -750,9 +755,15 @@ private[spark] class Executor(
private[this] val takeThreadDump: Boolean = conf.get(TASK_REAPER_THREAD_DUMP)

override def run(): Unit = {
try {
setMDCForTask(taskRunner.taskName, taskRunner.mdcProperties)
runInternal()
} finally {
MDC.clear()
}
}

setMDCForTask(taskRunner.taskName, taskRunner.mdcProperties)

private def runInternal(): Unit = {
val startTimeNs = System.nanoTime()
def elapsedTimeNs = System.nanoTime() - startTimeNs
def timeoutExceeded(): Boolean = killTimeoutNs > 0 && elapsedTimeNs > killTimeoutNs
Expand Down