diff options
author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-03-19 21:34:34 -0700 |
---|---|---|
committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-03-19 21:34:34 -0700 |
commit | 1cbbe94ac13ad8e1f08a6c325bf24e36827d0201 (patch) | |
tree | bc6b1e0d40a4348b694c5d387c7720c02260d74e | |
parent | 71e53f889477cf9b52952f9381801334e7309851 (diff) | |
parent | fb34967815bd990a612a69dc5b428cf776f9e368 (diff) | |
download | spark-1cbbe94ac13ad8e1f08a6c325bf24e36827d0201.tar.gz spark-1cbbe94ac13ad8e1f08a6c325bf24e36827d0201.tar.bz2 spark-1cbbe94ac13ad8e1f08a6c325bf24e36827d0201.zip |
Merge pull request #534 from stephenh/removetrycatch
Remove try/catch block that can't be hit.
-rw-r--r-- | core/src/main/scala/spark/deploy/worker/Worker.scala | 14 |
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() { |