Skip to content

Commit d508d92

Browse files
Review comments are addressed.
1 parent 3da98c7 commit d508d92

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ private[spark] class FIFOSchedulableBuilder(val rootPool: Pool)
5656
private[spark] class FairSchedulableBuilder(val rootPool: Pool, conf: SparkConf)
5757
extends SchedulableBuilder with Logging {
5858

59-
val schedulerAllocFile = conf.getOption("spark.scheduler.allocation.file")
59+
val SCHEDULER_ALLOCATION_FILE_PROPERTY = "spark.scheduler.allocation.file"
60+
val schedulerAllocFile = conf.getOption(SCHEDULER_ALLOCATION_FILE_PROPERTY)
6061
val DEFAULT_SCHEDULER_FILE = "fairscheduler.xml"
6162
val FAIR_SCHEDULER_PROPERTIES = "spark.scheduler.pool"
6263
val DEFAULT_POOL_NAME = "default"
@@ -82,9 +83,9 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool, conf: SparkConf)
8283
logInfo(s"Creating Fair Scheduler pools from default file: $DEFAULT_SCHEDULER_FILE")
8384
Some((is, DEFAULT_SCHEDULER_FILE))
8485
} else {
85-
logWarning("Fair Scheduler configuration file not found so jobs will be scheduled " +
86-
s"in FIFO order. To use fair scheduling, configure pools in $DEFAULT_SCHEDULER_FILE " +
87-
"or set spark.scheduler.allocation.file to a file that contains the configuration.")
86+
logWarning("Fair Scheduler configuration file not found so jobs will be scheduled in " +
87+
s"FIFO order. To use fair scheduling, configure pools in $DEFAULT_SCHEDULER_FILE or " +
88+
s"set $SCHEDULER_ALLOCATION_FILE_PROPERTY to a file that contains the configuration.")
8889
None
8990
}
9091
}

0 commit comments

Comments
 (0)