From f55ced3899cb80e23617dcacc3c548a88873f4c0 Mon Sep 17 00:00:00 2001 From: David Lewis Date: Sun, 8 Oct 2017 12:25:19 -0600 Subject: [PATCH] allowing configuration of default scheduling mode and properties --- .../org/apache/spark/scheduler/SchedulableBuilder.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala b/core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala index 5f3c280ec31ed..d7f6eb5022161 100644 --- a/core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala +++ b/core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala @@ -66,9 +66,12 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool, conf: SparkConf) val WEIGHT_PROPERTY = "weight" val POOL_NAME_PROPERTY = "@name" val POOLS_PROPERTY = "pool" - val DEFAULT_SCHEDULING_MODE = SchedulingMode.FIFO - val DEFAULT_MINIMUM_SHARE = 0 - val DEFAULT_WEIGHT = 1 + val DEFAULT_SCHEDULING_MODE = conf + .getOption("spark.scheduler.default.mode") + .flatMap(s => SchedulingMode.values.find(_.toString == s)) + .getOrElse(SchedulingMode.FIFO) + val DEFAULT_MINIMUM_SHARE = conf.getInt("spark.scheduler.default.minShare", 0) + val DEFAULT_WEIGHT = conf.getInt("spark.scheduler.default.weight", 1) override def buildPools() { var fileData: Option[(InputStream, String)] = None