Merge pull request #1741 from akka/wip-3533-cluster-startup-failure-patriknw

=clu #3533 Harden cluster startup error handling
This commit is contained in:
Patrik Nordwall 2013-09-27 05:44:22 -07:00
commit 68073d397e

View file

@ -166,9 +166,12 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
Await.result((clusterDaemons ? InternalClusterAction.GetClusterCoreRef).mapTo[ActorRef], timeout.duration)
} catch {
case NonFatal(e)
log.error(e, "Failed to startup Cluster")
log.error(e, "Failed to startup Cluster. You can try to increase 'akka.actor.creation-timeout'.")
shutdown()
throw e
// don't re-throw, that would cause the extension to be re-recreated
// from shutdown() or other places, which may result in
// InvalidActorNameException: actor name [cluster] is not unique
system.deadLetters
}
}