raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Minor refactoring and restructuring

Browse source 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2011-07-05 15:58:19 +02:00
parent 4a179d14bb
commit 9af5df4b02
3 changed files with 5 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
akka-cluster/src/main/scala/akka/cluster/Cluster.scala
View file

@ -1261,12 +1261,10 @@ class DefaultClusterNode private[akka] (
"\n\tserializer = [%s]")
.format(nodeAddress.clusterName, nodeAddress.nodeName, port, zkServerAddresses, serializer))
EventHandler.info(this, "Starting up remote server [%s]".format(remoteServerAddress.toString))
createRootClusterNode()
val isLeader = joinLeaderElection()
if (isLeader) createNodeStructureIfNeeded()
createZooKeeperPathStructureIfNeeded()
registerListeners()
joinCluster()
createActorsAtAddressPath()
joinLeaderElection()
fetchMembershipNodes()
EventHandler.info(this, "Cluster node [%s] started successfully".format(nodeAddress))
}
@ -1387,6 +1385,7 @@ class DefaultClusterNode private[akka] (
EventHandler.error(error, this, error.toString)
throw error
}
ignore[ZkNodeExistsException](zkClient.createPersistent(nodeToUuidsPathFor(nodeAddress.nodeName)))
}
private[cluster] def joinLeaderElection(): Boolean = {
@ -1406,10 +1405,6 @@ class DefaultClusterNode private[akka] (
}
}
private[cluster] def createActorsAtAddressPath() {
ignore[ZkNodeExistsException](zkClient.createPersistent(nodeToUuidsPathFor(nodeAddress.nodeName)))
}
private[cluster] def failOverClusterActorRefConnections(from: InetSocketAddress, to: InetSocketAddress) {
clusterActorRefs.values(from) foreach (_.failOver(from, to))
}
@ -1511,14 +1506,12 @@ class DefaultClusterNode private[akka] (
}
}
private def createRootClusterNode() {
private def createZooKeeperPathStructureIfNeeded() {
ignore[ZkNodeExistsException] {
zkClient.create(CLUSTER_PATH, null, CreateMode.PERSISTENT)
EventHandler.info(this, "Created node [%s]".format(CLUSTER_PATH))
}
}
private def createNodeStructureIfNeeded() {
basePaths.foreach { path ⇒
try {
ignore[ZkNodeExistsException](zkClient.create(path, null, CreateMode.PERSISTENT))