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

1. Makes sure to check if 'akka.enabled-modules=["cluster"]' is set before checking if the akka-cluster.jar is on the classpath, allowing non-cluster deployment even with the JAR on the classpath

Browse source 
2. Fixed bug with duplicate entries in replica set for an actor address
3. Turned on clustering for all Multi JVM tests

Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2011-07-05 14:46:05 +02:00
parent f2dd6bddb3
commit 4a179d14bb
37 changed files with 52 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1273,10 +1273,10 @@ class DefaultClusterNode private[akka] (
/**
* Returns a random set with node names of size 'replicationFactor'.
* Default replicationFactor is 0, which returns the empty Vector.
* Default replicationFactor is 0, which returns the empty Set.
*/
private def nodesForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Vector[String] = {
var replicaNames = Vector.empty[String]
private def nodesForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Set[String] = {
var replicaNames = Set.empty[String]
val nrOfClusterNodes = nodeConnections.size
if (replicationFactor < 1) return replicaNames
@ -1288,7 +1288,7 @@ class DefaultClusterNode private[akka] (
if (actorAddress.isDefined) { // use 'preferred-nodes' in deployment config for the actor
Deployer.deploymentFor(actorAddress.get) match {
case Deploy(_, _, _, Clustered(nodes, _, _)) ⇒
nodes map (node ⇒ Deployer.nodeNameFor(node)) take replicationFactor
nodes map (node ⇒ DeploymentConfig.nodeNameFor(node)) take replicationFactor
case _ ⇒
throw new ClusterException("Actor [" + actorAddress.get + "] is not configured as clustered")
}
@ -1298,7 +1298,7 @@ class DefaultClusterNode private[akka] (
nodeName ← preferredNodes
key ← nodeConnections.keys
if key == nodeName
} replicaNames = replicaNames :+ nodeName
} replicaNames = replicaNames + nodeName
val nrOfCurrentReplicaNames = replicaNames.size
@ -1308,7 +1308,7 @@ class DefaultClusterNode private[akka] (
else {
val random = new java.util.Random(System.currentTimeMillis)
while (replicaNames.size < replicationFactor) {
replicaNames = replicaNames :+ membershipNodes(random.nextInt(nrOfClusterNodes))
replicaNames = replicaNames + membershipNodes(random.nextInt(nrOfClusterNodes))
}
replicaNames
}
@ -1321,9 +1321,9 @@ class DefaultClusterNode private[akka] (
/**
* Returns a random set with replica connections of size 'replicationFactor'.
* Default replicationFactor is 0, which returns the empty Vector.
* Default replicationFactor is 0, which returns the empty Set.
*/
private def nodeConnectionsForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Vector[ActorRef] = {
private def nodeConnectionsForReplicationFactor(replicationFactor: Int = 0, actorAddress: Option[String] = None): Set[ActorRef] = {
for {
node ← nodesForReplicationFactor(replicationFactor, actorAddress)
connectionOption ← nodeConnections.get(node)