aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorjerryshao <saisai.shao@intel.com>2015-02-26 22:35:43 -0800
committerAndrew Or <andrew@databricks.com>2015-02-26 22:35:43 -0800
commit12135e90549f957962899487cd5eb95badd8976d (patch)
treedd81b3345e5e7990fa0df047ff5ac7b3ace16c09 /core
parent5e5ad6558d60cfbf360708584e883e80d363e33e (diff)
downloadspark-12135e90549f957962899487cd5eb95badd8976d.tar.gz
spark-12135e90549f957962899487cd5eb95badd8976d.tar.bz2
spark-12135e90549f957962899487cd5eb95badd8976d.zip
[SPARK-5771][UI][hotfix] Change Requested Cores into * if default cores is not set
cc andrewor14, srowen. Author: jerryshao <saisai.shao@intel.com> Closes #4800 from jerryshao/SPARK-5771 and squashes the following commits: a2483c2 [jerryshao] Change the UI of Requested Cores into * if default cores is not set
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
index 9dd96493ee..c7a71ea72a 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
@@ -182,7 +182,7 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
}
}
<td>
- {app.requestedCores}
+ {if (app.requestedCores == Int.MaxValue) "*" else app.requestedCores}
</td>
<td sorttable_customkey={app.desc.memoryPerSlave.toString}>
{Utils.megabytesToString(app.desc.memoryPerSlave)}