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

Change node naming. See 2115

Browse source
This commit is contained in:
Patrik Nordwall 2012-05-25 08:43:11 +02:00
parent ee73090c98
commit ed31c1738f
2 changed files with 25 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

30
akka-cluster/src/multi-jvm/scala/akka/cluster/NodeMembershipSpec.scala
View file

@ -33,31 +33,31 @@ abstract class NodeMembershipSpec extends MultiNodeSpec(NodeMembershipMultiJvmSp
override def initialParticipants = 3 override def initialParticipants = 3
def node() = Cluster(system) def cluster: Cluster = Cluster(system)
after { after {
testConductor.enter("after") testConductor.enter("after")
} }
"A set of connected cluster systems" must { val firstAddress = node(first).address
val secondAddress = node(second).address
val thirdAddress = node(third).address
val firstAddress = testConductor.getAddressFor(first).await "A set of connected cluster systems" must {
val secondAddress = testConductor.getAddressFor(second).await
val thirdAddress = testConductor.getAddressFor(third).await
"(when two systems) start gossiping to each other so that both systems gets the same gossip info" in { "(when two systems) start gossiping to each other so that both systems gets the same gossip info" in {
runOn(first, second) { runOn(first, second) {
node().join(firstAddress) cluster.join(firstAddress)
awaitCond(node().latestGossip.members.size == 2) awaitCond(cluster.latestGossip.members.size == 2)
val members = node().latestGossip.members.toIndexedSeq val members = cluster.latestGossip.members.toIndexedSeq
members.size must be(2) members.size must be(2)
members(0).address must be(firstAddress) members(0).address must be(firstAddress)
members(1).address must be(secondAddress) members(1).address must be(secondAddress)
awaitCond { awaitCond {
node().latestGossip.members.forall(_.status == MemberStatus.Up) cluster.latestGossip.members.forall(_.status == MemberStatus.Up)
} }
awaitCond(node().convergence.isDefined) awaitCond(cluster.convergence.isDefined)
} }
} }
@ -65,20 +65,20 @@ abstract class NodeMembershipSpec extends MultiNodeSpec(NodeMembershipMultiJvmSp
"(when three systems) start gossiping to each other so that both systems gets the same gossip info" in { "(when three systems) start gossiping to each other so that both systems gets the same gossip info" in {
runOn(third) { runOn(third) {
node().join(firstAddress) cluster.join(firstAddress)
} }
// runOn all // runOn all
awaitCond(node().latestGossip.members.size == 3) awaitCond(cluster.latestGossip.members.size == 3)
val members = node().latestGossip.members.toIndexedSeq val members = cluster.latestGossip.members.toIndexedSeq
members.size must be(3) members.size must be(3)
members(0).address must be(firstAddress) members(0).address must be(firstAddress)
members(1).address must be(secondAddress) members(1).address must be(secondAddress)
members(2).address must be(thirdAddress) members(2).address must be(thirdAddress)
awaitCond { awaitCond {
node().latestGossip.members.forall(_.status == MemberStatus.Up) cluster.latestGossip.members.forall(_.status == MemberStatus.Up)
} }
awaitCond(node().convergence.isDefined) awaitCond(cluster.convergence.isDefined)
} }
} }

21
akka-cluster/src/multi-jvm/scala/akka/cluster/NodeStartupSpec.scala
View file

@ -31,27 +31,28 @@ abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) wi
override def initialParticipants = 2 override def initialParticipants = 2
def node() = Cluster(system) def cluster: Cluster = Cluster(system)
after { after {
testConductor.enter("after") testConductor.enter("after")
} }
val firstAddress = testConductor.getAddressFor(first).await val firstAddress = node(first).address
val secondAddress = node(second).address
"A first cluster node with a 'node-to-join' config set to empty string (singleton cluster)" must { "A first cluster node with a 'node-to-join' config set to empty string (singleton cluster)" must {
"be a singleton cluster when started up" in { "be a singleton cluster when started up" in {
runOn(first) { runOn(first) {
awaitCond(node().isSingletonCluster) awaitCond(cluster.isSingletonCluster)
// FIXME #2117 singletonCluster should reach convergence // FIXME #2117 singletonCluster should reach convergence
//awaitCond(node().convergence.isDefined) //awaitCond(cluster.convergence.isDefined)
} }
} }
"be in 'Joining' phase when started up" in { "be in 'Joining' phase when started up" in {
runOn(first) { runOn(first) {
val members = node().latestGossip.members val members = cluster.latestGossip.members
members.size must be(1) members.size must be(1)
val joiningMember = members find (_.address == firstAddress) val joiningMember = members find (_.address == firstAddress)
@ -65,18 +66,16 @@ abstract class NodeStartupSpec extends MultiNodeSpec(NodeStartupMultiJvmSpec) wi
"join the other node cluster when sending a Join command" in { "join the other node cluster when sending a Join command" in {
runOn(second) { runOn(second) {
node().join(firstAddress) cluster.join(firstAddress)
} }
// runOn all
val secondAddress = testConductor.getAddressFor(second).await
awaitCond { awaitCond {
node.latestGossip.members.exists { member ⇒ cluster.latestGossip.members.exists { member ⇒
member.address == secondAddress && member.status == MemberStatus.Up member.address == secondAddress && member.status == MemberStatus.Up
} }
} }
node().latestGossip.members.size must be(2) cluster.latestGossip.members.size must be(2)
awaitCond(node().convergence.isDefined) awaitCond(cluster.convergence.isDefined)
} }
} }