Github user kayousterhout commented on a diff in the pull request:
https://github.com/apache/spark/pull/16813#discussion_r99717574
--- Diff:
core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala ---
@@ -69,19 +72,29 @@ private[spark] class FairSchedulableBuilder(val
rootPool: Pool, conf: SparkConf)
val DEFAULT_WEIGHT = 1
override def buildPools() {
- var is: Option[InputStream] = None
+ var fileData: Option[FileData] = None
try {
- is = Option {
- schedulerAllocFile.map { f =>
- new FileInputStream(f)
- }.getOrElse {
-
Utils.getSparkClassLoader.getResourceAsStream(DEFAULT_SCHEDULER_FILE)
+ fileData = schedulerAllocFile.map { f =>
+ Some(FileData(new FileInputStream(f), f))
+ }.getOrElse {
+ val is =
Utils.getSparkClassLoader.getResourceAsStream(DEFAULT_SCHEDULER_FILE)
+ if(is != null) Some(FileData(is, DEFAULT_SCHEDULER_FILE))
+ else {
+ logWarning(s"No Fair Scheduler file found.")
+ None
}
}
- is.foreach { i => buildFairSchedulerPool(i) }
+ fileData.foreach { data =>
+ logInfo(s"Fair Scheduler file: ${data.fileName} is found
successfully and will be parsed.")
+ buildFairSchedulerPool(data.inputStream)
+ }
+ } catch {
+ case NonFatal(t) =>
+ logError("Fair Scheduler can not be built.", t)
--- End diff --
How about "Error while building the fair scheduler pools: ", t
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
