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

Cleanup based on review comments, see #2201

Browse source
This commit is contained in:
Patrik Nordwall 2012-06-18 11:16:30 +02:00
parent aae8869390
commit fb04786072
2 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
View file

@ -42,11 +42,14 @@ trait MultiNodeClusterSpec extends FailureDetectorStrategy with Suite { self: Mu
/**
* Lookup the Address for the role.
*
* Implicit conversion from RoleName to Address.
*
* It is cached, which has the implication that stopping
* and then restarting a role (jvm) with another address is not
* supported.
*/
def address(role: RoleName): Address = {
implicit def address(role: RoleName): Address = {
cachedAddresses.get(role) match {
case null ⇒
val address = node(role).address
@ -56,11 +59,6 @@ trait MultiNodeClusterSpec extends FailureDetectorStrategy with Suite { self: Mu
}
}
/**
* implicit conversion from RoleName to Address
*/
implicit def role2Address(role: RoleName): Address = address(role)
// Cluster tests are written so that if previous step (test method) failed
// it will most likely not be possible to run next step. This ensures
// fail fast of steps after the first failure.
@ -196,8 +194,6 @@ trait MultiNodeClusterSpec extends FailureDetectorStrategy with Suite { self: Mu
def compare(x: RoleName, y: RoleName) = addressOrdering.compare(address(x), address(y))
}
def roleName(addr: Address): Option[RoleName] = {
roles.find(address(_) == addr)
}
def roleName(addr: Address): Option[RoleName] = roles.find(address(_) == addr)
}

6
akka-cluster/src/test/scala/akka/cluster/ClusterSpec.scala
View file

@ -83,7 +83,7 @@ class ClusterSpec extends AkkaSpec(ClusterSpec.config) with BeforeAndAfter {
before {
cluster._gossipToUnreachableProbablity = 0.0
cluster._gossipToDeputyProbablity = 0.0
addresses.foreach(failureDetector.remove(_))
addresses foreach failureDetector.remove
deterministicRandom.set(0)
}
@ -180,7 +180,7 @@ class ClusterSpec extends AkkaSpec(ClusterSpec.config) with BeforeAndAfter {
"gossip to random unreachable node" in {
val dead = Set(addresses(1))
dead.foreach(failureDetector.markNodeAsUnavailable(_))
dead foreach failureDetector.markNodeAsUnavailable
cluster._gossipToUnreachableProbablity = 1.0 // always
cluster.reapUnreachableMembers()
@ -198,7 +198,7 @@ class ClusterSpec extends AkkaSpec(ClusterSpec.config) with BeforeAndAfter {
cluster._gossipToDeputyProbablity = -1.0 // real impl
// 0 and 2 still alive
val dead = Set(addresses(1), addresses(3), addresses(4), addresses(5))
dead.foreach(failureDetector.markNodeAsUnavailable(_))
dead foreach failureDetector.markNodeAsUnavailable
cluster.reapUnreachableMembers()
cluster.latestGossip.overview.unreachable.map(_.address) must be(dead)