diff options
| author | Matei Zaharia <matei@databricks.com> | 2014-01-09 23:58:49 -0800 |
|---|---|---|
| committer | Matei Zaharia <matei@databricks.com> | 2014-01-09 23:58:49 -0800 |
| commit | 0ebc97305a0e23a9d2183c335998c800c5d865b7 (patch) | |
| tree | 5bfce6ab75fc12d697bc6980690d08a368c2267b | |
| parent | dd03cea02a55746ae7e753f00ef00fc50ecaad46 (diff) | |
| parent | c43eb006442bbab14f5cd0898b6ad0f39f273506 (diff) | |
| download | spark-0ebc97305a0e23a9d2183c335998c800c5d865b7.tar.gz spark-0ebc97305a0e23a9d2183c335998c800c5d865b7.tar.bz2 spark-0ebc97305a0e23a9d2183c335998c800c5d865b7.zip | |
Merge pull request #375 from mateiz/option-fix
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.
| -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> |