diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-01-09 18:14:20 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-01-09 18:14:20 -0800 |
| commit | c43eb006442bbab14f5cd0898b6ad0f39f273506 (patch) | |
| tree | 874fe803dcdf666926af825603138f0fa17f0752 /core/src/main | |
| parent | 26cdb5f68a83e904e3e9a114790c729ca2eb3040 (diff) | |
| download | spark-c43eb006442bbab14f5cd0898b6ad0f39f273506.tar.gz spark-c43eb006442bbab14f5cd0898b6ad0f39f273506.tar.bz2 spark-c43eb006442bbab14f5cd0898b6ad0f39f273506.zip | |
Fix bug added when we changed AppDescription.maxCores to an Option
The Scala compiler warned about this -- we were comparing an Option
against an integer now.
Diffstat (limited to 'core/src/main')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala index dbb0cb90f5..9485bfd89e 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala @@ -67,11 +67,11 @@ private[spark] class ApplicationPage(parent: MasterWebUI) { <li><strong>User:</strong> {app.desc.user}</li> <li><strong>Cores:</strong> { - if (app.desc.maxCores == Integer.MAX_VALUE) { + if (app.desc.maxCores == None) { "Unlimited (%s granted)".format(app.coresGranted) } else { "%s (%s granted, %s left)".format( - app.desc.maxCores, app.coresGranted, app.coresLeft) + app.desc.maxCores.get, app.coresGranted, app.coresLeft) } } </li> |