Skip to content
Snippets Groups Projects
Commit b1019941 authored by Patrick Wendell's avatar Patrick Wendell
Browse files

Slight refactoring to SparkContext functions

parent cfcd77b5
No related branches found
No related tags found
No related merge requests found
...@@ -581,10 +581,17 @@ class SparkContext( ...@@ -581,10 +581,17 @@ class SparkContext(
* Return pools for fair scheduler * Return pools for fair scheduler
* TODO(xiajunluan): We should take nested pools into account * TODO(xiajunluan): We should take nested pools into account
*/ */
def getPools: ArrayBuffer[Schedulable] = { def getAllPools: ArrayBuffer[Schedulable] = {
taskScheduler.rootPool.schedulableQueue taskScheduler.rootPool.schedulableQueue
} }
/**
* Return the pool associated with the given name, if one exists
*/
def getPoolForName(pool: String): Option[Schedulable] = {
taskScheduler.rootPool.schedulableNameToSchedulable.get(pool)
}
/** /**
* Return current scheduling mode * Return current scheduling mode
*/ */
...@@ -592,10 +599,6 @@ class SparkContext( ...@@ -592,10 +599,6 @@ class SparkContext(
taskScheduler.schedulingMode taskScheduler.schedulingMode
} }
def getPoolNameToPool: HashMap[String, Schedulable] = {
taskScheduler.rootPool.schedulableNameToSchedulable
}
/** /**
* Clear the job's list of files added by `addFile` so that they do not get downloaded to * Clear the job's list of files added by `addFile` so that they do not get downloaded to
* any new nodes. * any new nodes.
......
...@@ -38,7 +38,7 @@ private[spark] class FIFOSource() extends PoolSource { ...@@ -38,7 +38,7 @@ private[spark] class FIFOSource() extends PoolSource {
*/ */
private[spark] class FairSource(sc: SparkContext) extends PoolSource { private[spark] class FairSource(sc: SparkContext) extends PoolSource {
def getPools: Seq[Schedulable] = { def getPools: Seq[Schedulable] = {
sc.getPools.toSeq sc.getAllPools.toSeq
} }
} }
...@@ -48,7 +48,7 @@ private[spark] class FairSource(sc: SparkContext) extends PoolSource { ...@@ -48,7 +48,7 @@ private[spark] class FairSource(sc: SparkContext) extends PoolSource {
private[spark] class PoolDetailSource(sc: SparkContext, poolName: String) extends PoolSource { private[spark] class PoolDetailSource(sc: SparkContext, poolName: String) extends PoolSource {
def getPools: Seq[Schedulable] = { def getPools: Seq[Schedulable] = {
val pools = HashSet[Schedulable]() val pools = HashSet[Schedulable]()
pools += sc.getPoolNameToPool(poolName) pools += sc.getPoolForName(poolName).get
pools.toSeq pools.toSeq
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment