You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2017/04/18 10:02:48 UTC
spark git commit: [SPARK-20344][SCHEDULER] Duplicate call in
FairSchedulableBuilder.addTaskSetManager
Repository: spark
Updated Branches:
refs/heads/master b0a1e93e9 -> 07fd94e0d
[SPARK-20344][SCHEDULER] Duplicate call in FairSchedulableBuilder.addTaskSetManager
## What changes were proposed in this pull request?
Eliminate the duplicate call to `Pool.getSchedulableByName()` in `FairSchedulableBuilder.addTaskSetManager`
## How was this patch tested?
./dev/run-tests
Author: Robert Stupp <sn...@snazy.de>
Closes #17647 from snazy/20344-dup-call-master.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/07fd94e0
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/07fd94e0
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/07fd94e0
Branch: refs/heads/master
Commit: 07fd94e0d05e827fae65d6e0e1cb89e28c8f2771
Parents: b0a1e93
Author: Robert Stupp <sn...@snazy.de>
Authored: Tue Apr 18 11:02:43 2017 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Tue Apr 18 11:02:43 2017 +0100
----------------------------------------------------------------------
.../spark/scheduler/SchedulableBuilder.scala | 32 ++++++++++----------
1 file changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/07fd94e0/core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala
----------------------------------------------------------------------
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 4171034..5f3c280 100644
--- a/core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala
+++ b/core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala
@@ -181,23 +181,23 @@ private[spark] class FairSchedulableBuilder(val rootPool: Pool, conf: SparkConf)
}
override def addTaskSetManager(manager: Schedulable, properties: Properties) {
- var poolName = DEFAULT_POOL_NAME
- var parentPool = rootPool.getSchedulableByName(poolName)
- if (properties != null) {
- poolName = properties.getProperty(FAIR_SCHEDULER_PROPERTIES, DEFAULT_POOL_NAME)
- parentPool = rootPool.getSchedulableByName(poolName)
- if (parentPool == null) {
- // we will create a new pool that user has configured in app
- // instead of being defined in xml file
- parentPool = new Pool(poolName, DEFAULT_SCHEDULING_MODE,
- DEFAULT_MINIMUM_SHARE, DEFAULT_WEIGHT)
- rootPool.addSchedulable(parentPool)
- logWarning(s"A job was submitted with scheduler pool $poolName, which has not been " +
- "configured. This can happen when the file that pools are read from isn't set, or " +
- s"when that file doesn't contain $poolName. Created $poolName with default " +
- s"configuration (schedulingMode: $DEFAULT_SCHEDULING_MODE, " +
- s"minShare: $DEFAULT_MINIMUM_SHARE, weight: $DEFAULT_WEIGHT)")
+ val poolName = if (properties != null) {
+ properties.getProperty(FAIR_SCHEDULER_PROPERTIES, DEFAULT_POOL_NAME)
+ } else {
+ DEFAULT_POOL_NAME
}
+ var parentPool = rootPool.getSchedulableByName(poolName)
+ if (parentPool == null) {
+ // we will create a new pool that user has configured in app
+ // instead of being defined in xml file
+ parentPool = new Pool(poolName, DEFAULT_SCHEDULING_MODE,
+ DEFAULT_MINIMUM_SHARE, DEFAULT_WEIGHT)
+ rootPool.addSchedulable(parentPool)
+ logWarning(s"A job was submitted with scheduler pool $poolName, which has not been " +
+ "configured. This can happen when the file that pools are read from isn't set, or " +
+ s"when that file doesn't contain $poolName. Created $poolName with default " +
+ s"configuration (schedulingMode: $DEFAULT_SCHEDULING_MODE, " +
+ s"minShare: $DEFAULT_MINIMUM_SHARE, weight: $DEFAULT_WEIGHT)")
}
parentPool.addSchedulable(manager)
logInfo("Added task set " + manager.name + " tasks to pool " + poolName)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org