Skip to content

[SPARK-20344][Scheduler] Duplicate call in FairSchedulableBuilder.addTaskSetManager #17647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
snazy wants to merge 2 commits into from
Closed

[SPARK-20344][Scheduler] Duplicate call in FairSchedulableBuilder.addTaskSetManager #17647

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05ccfac
remove duplicate call to getSchedulableByName
snazy Apr 16, 2017
410df60
review comments
snazy Apr 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions core/src/main/scala/org/apache/spark/scheduler/SchedulableBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down