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

Simplified config and removed old too-long timeout.

Browse source 
Signed-off-by: Jonas Bonér <jonas@jonasboner.com>
This commit is contained in:
Jonas Bonér 2012-05-25 17:43:03 +02:00
parent 5e6f856743
commit ea99a1f315
2 changed files with 16 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

22
akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUnreachableSpec.scala
View file

@ -17,18 +17,12 @@ object ClientDowningNodeThatIsUnreachableMultiJvmSpec extends MultiNodeConfig {
val third = role("third")
val fourth = role("fourth")
val waitForConvergence = 20 seconds
commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString("""
akka {
#loglevel = "DEBUG"
#stdout-loglevel = "DEBUG"
cluster {
gossip-frequency = 100 ms
leader-actions-frequency = 100 ms
periodic-tasks-initial-delay = 300 ms
auto-down = off
}
akka.cluster {
gossip-frequency = 100 ms
leader-actions-frequency = 100 ms
periodic-tasks-initial-delay = 300 ms
auto-down = off
}
""")))
}
@ -46,9 +40,9 @@ class ClientDowningNodeThatIsUnreachableSpec extends MultiNodeSpec(ClientDowning
def node = Cluster(system)
def assertMemberRing(nrOfMembers: Int, canNotBePartOfRing: Seq[Address] = Seq.empty[Address]): Unit = {
awaitCond(node.latestGossip.members.size == nrOfMembers, waitForConvergence)
awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up), waitForConvergence)
awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address == address))), waitForConvergence)
awaitCond(node.latestGossip.members.size == nrOfMembers)
awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up))
awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address == address))))
}
"Client of a 4 node cluster" must {

22
akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala
View file

@ -17,18 +17,12 @@ object ClientDowningNodeThatIsUpMultiJvmSpec extends MultiNodeConfig {
val third = role("third")
val fourth = role("fourth")
val waitForConvergence = 20 seconds
commonConfig(debugConfig(on = false).withFallback(ConfigFactory.parseString("""
akka {
#loglevel = "DEBUG"
#stdout-loglevel = "DEBUG"
cluster {
gossip-frequency = 100 ms
leader-actions-frequency = 100 ms
periodic-tasks-initial-delay = 300 ms
auto-down = off
}
akka.cluster {
gossip-frequency = 100 ms
leader-actions-frequency = 100 ms
periodic-tasks-initial-delay = 300 ms
auto-down = off
}
""")))
}
@ -46,9 +40,9 @@ class ClientDowningNodeThatIsUpSpec extends MultiNodeSpec(ClientDowningNodeThatI
def node = Cluster(system)
def assertMemberRing(nrOfMembers: Int, canNotBePartOfRing: Seq[Address] = Seq.empty[Address]): Unit = {
awaitCond(node.latestGossip.members.size == nrOfMembers, waitForConvergence)
awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up), waitForConvergence)
awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address.port == address.port))), waitForConvergence)
awaitCond(node.latestGossip.members.size == nrOfMembers)
awaitCond(node.latestGossip.members.forall(_.status == MemberStatus.Up))
awaitCond(canNotBePartOfRing forall (address => !(node.latestGossip.members exists (_.address.port == address.port))))
}
"Client of a 4 node cluster" must {