Fix NPE in Master WebUI after recoverying Master

zsxwing · zsxwing · commit 3b370702fc0b · 2015-12-11T11:53:00.000-08:00
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
@@ -66,6 +66,7 @@ private[spark] class ApplicationInfo(
     nextExecutorId = 0
     removedExecutors = new ArrayBuffer[ExecutorDesc]
     executorLimit = Integer.MAX_VALUE
+    appUIUrlAtHistoryServer = None
   }
 
   private def newExecutorId(useID: Option[Int] = None): Int = {
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala b/core/src/main/scala/org/apache/spark/deploy/worker/Worker.scala
@@ -690,7 +690,7 @@ private[deploy] object Worker extends Logging {
     val conf = new SparkConf
     val args = new WorkerArguments(argStrings, conf)
     val rpcEnv = startRpcEnvAndEndpoint(args.host, args.port, args.webUiPort, args.cores,
-      args.memory, args.masters, args.workDir)
+      args.memory, args.masters, args.workDir, conf = conf)
     rpcEnv.awaitTermination()
   }
 

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ private[spark] class ApplicationInfo(`
`66`	`66`	`nextExecutorId = 0`
`67`	`67`	`removedExecutors = new ArrayBuffer[ExecutorDesc]`
`68`	`68`	`executorLimit = Integer.MAX_VALUE`
	`69`	`+ appUIUrlAtHistoryServer = None`
`69`	`70`	`}`
`70`	`71`
`71`	`72`	`private def newExecutorId(useID: Option[Int] = None): Int = {`
Original file line number	Diff line number	Diff line change
`@@ -690,7 +690,7 @@ private[deploy] object Worker extends Logging {`
`690`	`690`	`val conf = new SparkConf`
`691`	`691`	`val args = new WorkerArguments(argStrings, conf)`
`692`	`692`	`val rpcEnv = startRpcEnvAndEndpoint(args.host, args.port, args.webUiPort, args.cores,`
`693`		`- args.memory, args.masters, args.workDir)`
	`693`	`+ args.memory, args.masters, args.workDir, conf = conf)`
`694`	`694`	`rpcEnv.awaitTermination()`
`695`	`695`	`}`
`696`	`696`