From c44fd6c2cc8789fae5dadefd6f568ec3191356b5 Mon Sep 17 00:00:00 2001
From: Saisai Shao <saisai.shao@intel.com>
Date: Sat, 28 Feb 2015 20:56:19 -0800
Subject: [PATCH] Display the actual cores requested when app is finished

---
 .../org/apache/spark/deploy/master/ApplicationInfo.scala  | 2 ++
 .../org/apache/spark/deploy/master/ui/MasterPage.scala    | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala b/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
index a962dc4af2f6c..c90d398ceee01 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ApplicationInfo.scala
@@ -43,6 +43,7 @@ private[spark] class ApplicationInfo(
   @transient var coresGranted: Int = _
   @transient var endTime: Long = _
   @transient var appSource: ApplicationSource = _
+  @transient var actualCoresRequested: Int = _
 
   @transient private var nextExecutorId: Int = _
 
@@ -79,6 +80,7 @@ private[spark] class ApplicationInfo(
     val exec = new ExecutorDesc(newExecutorId(useID), this, worker, cores, desc.memoryPerSlave)
     executors(exec.id) = exec
     coresGranted += cores
+    actualCoresRequested += cores
     exec
   }
 
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 c086cadca2c7d..f29bc99918c18 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
@@ -218,7 +218,13 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
         }
       }
       <td>
-        {if (app.requestedCores == Int.MaxValue) "*" else app.requestedCores}
+        {
+          if (active) {
+            if (app.requestedCores == Int.MaxValue) "*" else app.requestedCores
+          } else {
+            app.actualCoresRequested
+          }
+        }
       </td>
       <td sorttable_customkey={app.desc.memoryPerSlave.toString}>
         {Utils.megabytesToString(app.desc.memoryPerSlave)}