aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorStephen Haberman <stephen@exigencecorp.com>2013-03-18 01:55:50 -0500
committerStephen Haberman <stephen@exigencecorp.com>2013-03-18 01:55:50 -0500
commitfb34967815bd990a612a69dc5b428cf776f9e368 (patch)
treef470e4c1a3747470985a022e61094f81a98c029a /core
parentcbf8f0d4dda41ffd45855eab8401fda9b64168cd (diff)
downloadspark-fb34967815bd990a612a69dc5b428cf776f9e368.tar.gz
spark-fb34967815bd990a612a69dc5b428cf776f9e368.tar.bz2
spark-fb34967815bd990a612a69dc5b428cf776f9e368.zip
Remove try/catch block that can't be hit.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/spark/deploy/worker/Worker.scala14
1 files changed, 4 insertions, 10 deletions
diff --git a/core/src/main/scala/spark/deploy/worker/Worker.scala b/core/src/main/scala/spark/deploy/worker/Worker.scala
index 2bbc931316..da3f4f636c 100644
--- a/core/src/main/scala/spark/deploy/worker/Worker.scala
+++ b/core/src/main/scala/spark/deploy/worker/Worker.scala
@@ -74,16 +74,10 @@ private[spark] class Worker(
def connectToMaster() {
logInfo("Connecting to master " + masterUrl)
- try {
- master = context.actorFor(Master.toAkkaUrl(masterUrl))
- master ! RegisterWorker(workerId, ip, port, cores, memory, webUiPort, publicAddress)
- context.system.eventStream.subscribe(self, classOf[RemoteClientLifeCycleEvent])
- context.watch(master) // Doesn't work with remote actors, but useful for testing
- } catch {
- case e: Exception =>
- logError("Failed to connect to master", e)
- System.exit(1)
- }
+ master = context.actorFor(Master.toAkkaUrl(masterUrl))
+ master ! RegisterWorker(workerId, ip, port, cores, memory, webUiPort, publicAddress)
+ context.system.eventStream.subscribe(self, classOf[RemoteClientLifeCycleEvent])
+ context.watch(master) // Doesn't work with remote actors, but useful for testing
}
def startWebUi() {