[SPARK-5416] init Executor.threadPool before ExecutorSource
Some ExecutorSource metrics can NPE by attempting to reference the threadpool otherwise. Author: Ryan Williams <ryan.blake.williams@gmail.com> Closes #4212 from ryan-williams/threadpool and squashes the following commits: 236f2ad [Ryan Williams] init Executor.threadPool before ExecutorSource
This commit is contained in:
parent
cf6778e8d8
commit
37d35ab53b
|
@ -75,6 +75,9 @@ private[spark] class Executor(
|
|||
Thread.setDefaultUncaughtExceptionHandler(SparkUncaughtExceptionHandler)
|
||||
}
|
||||
|
||||
// Start worker thread pool
|
||||
val threadPool = Utils.newDaemonCachedThreadPool("Executor task launch worker")
|
||||
|
||||
val executorSource = new ExecutorSource(this, executorId)
|
||||
|
||||
if (!isLocal) {
|
||||
|
@ -101,9 +104,6 @@ private[spark] class Executor(
|
|||
// Limit of bytes for total size of results (default is 1GB)
|
||||
private val maxResultSize = Utils.getMaxResultSize(conf)
|
||||
|
||||
// Start worker thread pool
|
||||
val threadPool = Utils.newDaemonCachedThreadPool("Executor task launch worker")
|
||||
|
||||
// Maintains the list of running tasks.
|
||||
private val runningTasks = new ConcurrentHashMap[Long, TaskRunner]
|
||||
|
||||
|
|
Loading…
Reference in a new issue