diff --git a/core/src/main/scala/org/apache/spark/deploy/ApplicationDescription.scala b/core/src/main/scala/org/apache/spark/deploy/ApplicationDescription.scala
index ae99432f5ce869e5059e545a239a609f3a9cd10a..78bbd5c03f4a621dd8d0b7f22426255843e031e4 100644
--- a/core/src/main/scala/org/apache/spark/deploy/ApplicationDescription.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/ApplicationDescription.scala
@@ -19,30 +19,17 @@ package org.apache.spark.deploy
import java.net.URI
-private[spark] class ApplicationDescription(
- val name: String,
- val maxCores: Option[Int],
- val memoryPerExecutorMB: Int,
- val command: Command,
- var appUiUrl: String,
- val eventLogDir: Option[URI] = None,
+private[spark] case class ApplicationDescription(
+ name: String,
+ maxCores: Option[Int],
+ memoryPerExecutorMB: Int,
+ command: Command,
+ appUiUrl: String,
+ eventLogDir: Option[URI] = None,
// short name of compression codec used when writing event logs, if any (e.g. lzf)
- val eventLogCodec: Option[String] = None,
- val coresPerExecutor: Option[Int] = None)
- extends Serializable {
-
- val user = System.getProperty("user.name", "<unknown>")
-
- def copy(
- name: String = name,
- maxCores: Option[Int] = maxCores,
- memoryPerExecutorMB: Int = memoryPerExecutorMB,
- command: Command = command,
- appUiUrl: String = appUiUrl,
- eventLogDir: Option[URI] = eventLogDir,
- eventLogCodec: Option[String] = eventLogCodec): ApplicationDescription =
- new ApplicationDescription(
- name, maxCores, memoryPerExecutorMB, command, appUiUrl, eventLogDir, eventLogCodec)
+ eventLogCodec: Option[String] = None,
+ coresPerExecutor: Option[Int] = None,
+ user: String = System.getProperty("user.name", "<unknown>")) {
override def toString: String = "ApplicationDescription(" + name + ")"
}
diff --git a/core/src/main/scala/org/apache/spark/deploy/DriverDescription.scala b/core/src/main/scala/org/apache/spark/deploy/DriverDescription.scala
index 659fb434a80f56abea578dd668f50380f74efc69..1f5626ab5a8961f53db955331c741f1452d28ddc 100644
--- a/core/src/main/scala/org/apache/spark/deploy/DriverDescription.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/DriverDescription.scala
@@ -17,21 +17,12 @@
package org.apache.spark.deploy
-private[deploy] class DriverDescription(
- val jarUrl: String,
- val mem: Int,
- val cores: Int,
- val supervise: Boolean,
- val command: Command)
- extends Serializable {
-
- def copy(
- jarUrl: String = jarUrl,
- mem: Int = mem,
- cores: Int = cores,
- supervise: Boolean = supervise,
- command: Command = command): DriverDescription =
- new DriverDescription(jarUrl, mem, cores, supervise, command)
+private[deploy] case class DriverDescription(
+ jarUrl: String,
+ mem: Int,
+ cores: Int,
+ supervise: Boolean,
+ command: Command) {
override def toString: String = s"DriverDescription (${command.mainClass})"
}
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 b40d20f9f78683dc01be970617b9d8c379b8aa1b..ac553b71115df3c321f2e0f411ba1458bc3681d3 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
@@ -41,6 +41,7 @@ private[spark] class ApplicationInfo(
@transient var coresGranted: Int = _
@transient var endTime: Long = _
@transient var appSource: ApplicationSource = _
+ @transient @volatile var appUIUrlAtHistoryServer: Option[String] = None
// A cap on the number of executors this application can have at any given time.
// By default, this is infinite. Only after the first allocation request is issued by the
@@ -135,4 +136,10 @@ private[spark] class ApplicationInfo(
}
}
+ /**
+ * Returns the original application UI url unless there is its address at history server
+ * is defined
+ */
+ def curAppUIUrl: String = appUIUrlAtHistoryServer.getOrElse(desc.appUiUrl)
+
}
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
index 6715d6c70f49743fd6d690f557d2680a9b3cdd5d..b25a487806c7fbbfd55c7d4e24938f3301f19694 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala
@@ -768,7 +768,8 @@ private[deploy] class Master(
ApplicationInfo = {
val now = System.currentTimeMillis()
val date = new Date(now)
- new ApplicationInfo(now, newApplicationId(date), desc, date, driver, defaultCores)
+ val appId = newApplicationId(date)
+ new ApplicationInfo(now, appId, desc, date, driver, defaultCores)
}
private def registerApplication(app: ApplicationInfo): Unit = {
@@ -920,7 +921,7 @@ private[deploy] class Master(
val eventLogDir = app.desc.eventLogDir
.getOrElse {
// Event logging is not enabled for this application
- app.desc.appUiUrl = notFoundBasePath
+ app.appUIUrlAtHistoryServer = Some(notFoundBasePath)
return None
}
@@ -954,7 +955,7 @@ private[deploy] class Master(
appIdToUI(app.id) = ui
webUi.attachSparkUI(ui)
// Application UI is successfully rebuilt, so link the Master UI to it
- app.desc.appUiUrl = ui.basePath
+ app.appUIUrlAtHistoryServer = Some(ui.basePath)
Some(ui)
} catch {
case fnf: FileNotFoundException =>
@@ -964,7 +965,7 @@ private[deploy] class Master(
logWarning(msg)
msg += " Did you specify the correct logging directory?"
msg = URLEncoder.encode(msg, "UTF-8")
- app.desc.appUiUrl = notFoundBasePath + s"?msg=$msg&title=$title"
+ app.appUIUrlAtHistoryServer = Some(notFoundBasePath + s"?msg=$msg&title=$title")
None
case e: Exception =>
// Relay exception message to application UI page
@@ -973,7 +974,8 @@ private[deploy] class Master(
var msg = s"Exception in replaying log for application $appName!"
logError(msg, e)
msg = URLEncoder.encode(msg, "UTF-8")
- app.desc.appUiUrl = notFoundBasePath + s"?msg=$msg&exception=$exception&title=$title"
+ app.appUIUrlAtHistoryServer =
+ Some(notFoundBasePath + s"?msg=$msg&exception=$exception&title=$title")
None
}
}
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 e28e7e379ac917a6498cd3d0ea2e4a675fe496b8..f405aa2bdc8b38c3c40b0b37a696f60334157350 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
@@ -76,7 +76,7 @@ private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app")
</li>
<li><strong>Submit Date:</strong> {app.submitDate}</li>
<li><strong>State:</strong> {app.state}</li>
- <li><strong><a href={app.desc.appUiUrl}>Application Detail UI</a></strong></li>
+ <li><strong><a href={app.curAppUIUrl}>Application Detail UI</a></strong></li>
</ul>
</div>
</div>
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 c3e20ebf8d6eb76e61fd45be86eb28c9ef7b1e76..ee539dd1f51135931d7e3d2392ee2dee624f6e6e 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
@@ -206,7 +206,7 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
{killLink}
</td>
<td>
- <a href={app.desc.appUiUrl}>{app.desc.name}</a>
+ <a href={app.curAppUIUrl}>{app.desc.name}</a>
</td>
<td>
{app.coresGranted}
diff --git a/core/src/test/scala/org/apache/spark/deploy/DeployTestUtils.scala b/core/src/test/scala/org/apache/spark/deploy/DeployTestUtils.scala
index 967aa0976f0ced3fbc04c3d620af3bfeaff845e5..3164760b08a71e2ae00bafcc381c426dee7fb17e 100644
--- a/core/src/test/scala/org/apache/spark/deploy/DeployTestUtils.scala
+++ b/core/src/test/scala/org/apache/spark/deploy/DeployTestUtils.scala
@@ -31,8 +31,9 @@ private[deploy] object DeployTestUtils {
}
def createAppInfo() : ApplicationInfo = {
+ val appDesc = createAppDesc()
val appInfo = new ApplicationInfo(JsonConstants.appInfoStartTime,
- "id", createAppDesc(), JsonConstants.submitDate, null, Int.MaxValue)
+ "id", appDesc, JsonConstants.submitDate, null, Int.MaxValue)
appInfo.endTime = JsonConstants.currTimeInMillis
appInfo
}