You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by we...@apache.org on 2018/01/09 02:44:32 UTC
spark git commit: [SPARK-22990][CORE] Fix method isFairScheduler in
JobsTab and StagesTab
Repository: spark
Updated Branches:
refs/heads/master 68ce792b5 -> 849043ce1
[SPARK-22990][CORE] Fix method isFairScheduler in JobsTab and StagesTab
## What changes were proposed in this pull request?
In current implementation, the function `isFairScheduler` is always false, since it is comparing String with `SchedulingMode`
Author: Wang Gengliang <lt...@gmail.com>
Closes #20186 from gengliangwang/isFairScheduler.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/849043ce
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/849043ce
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/849043ce
Branch: refs/heads/master
Commit: 849043ce1d28a976659278d29368da0799329db8
Parents: 68ce792
Author: Wang Gengliang <lt...@gmail.com>
Authored: Tue Jan 9 10:44:21 2018 +0800
Committer: Wenchen Fan <we...@databricks.com>
Committed: Tue Jan 9 10:44:21 2018 +0800
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala | 8 ++++----
core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/849043ce/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala
index 99eab1b..ff1b75e 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobsTab.scala
@@ -34,10 +34,10 @@ private[ui] class JobsTab(parent: SparkUI, store: AppStatusStore)
val killEnabled = parent.killEnabled
def isFairScheduler: Boolean = {
- store.environmentInfo().sparkProperties.toMap
- .get("spark.scheduler.mode")
- .map { mode => mode == SchedulingMode.FAIR }
- .getOrElse(false)
+ store
+ .environmentInfo()
+ .sparkProperties
+ .contains(("spark.scheduler.mode", SchedulingMode.FAIR.toString))
}
def getSparkUser: String = parent.getSparkUser
http://git-wip-us.apache.org/repos/asf/spark/blob/849043ce/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala
index be05a96..10b0320 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagesTab.scala
@@ -37,10 +37,10 @@ private[ui] class StagesTab(val parent: SparkUI, val store: AppStatusStore)
attachPage(new PoolPage(this))
def isFairScheduler: Boolean = {
- store.environmentInfo().sparkProperties.toMap
- .get("spark.scheduler.mode")
- .map { mode => mode == SchedulingMode.FAIR }
- .getOrElse(false)
+ store
+ .environmentInfo()
+ .sparkProperties
+ .contains(("spark.scheduler.mode", SchedulingMode.FAIR.toString))
}
def handleKillRequest(request: HttpServletRequest): Unit = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org