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

Changed protocol fields from "akka" to "tcp.akka"

Browse source
This commit is contained in:
Endre Sándor Varga 2012-12-20 10:57:13 +01:00
parent e7753cb7e6
commit fec27ee08b
11 changed files with 71 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-cluster/src/test/scala/akka/cluster/AccrualFailureDetectorSpec.scala
View file

@ -24,8 +24,8 @@ class AccrualFailureDetectorSpec extends AkkaSpec("""
} }
"An AccrualFailureDetector" must { "An AccrualFailureDetector" must {
val conn = Address("akka", "", "localhost", 2552) val conn = Address("tcp.akka", "", "localhost", 2552)
val conn2 = Address("akka", "", "localhost", 2553) val conn2 = Address("tcp.akka", "", "localhost", 2553)
def fakeTimeGenerator(timeIntervals: immutable.Seq[Long]): () ⇒ Long = { def fakeTimeGenerator(timeIntervals: immutable.Seq[Long]): () ⇒ Long = {
var times = timeIntervals.tail.foldLeft(List[Long](timeIntervals.head))((acc, c) ⇒ acc ::: List[Long](acc.last + c)) var times = timeIntervals.tail.foldLeft(List[Long](timeIntervals.head))((acc, c) ⇒ acc ::: List[Long](acc.last + c))

10
akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventPublisherSpec.scala
View file

@ -23,11 +23,11 @@ class ClusterDomainEventPublisherSpec extends AkkaSpec
with BeforeAndAfterEach with ImplicitSender { with BeforeAndAfterEach with ImplicitSender {
var publisher: ActorRef = _ var publisher: ActorRef = _
val a1 = Member(Address("akka", "sys", "a", 2552), Up) val a1 = Member(Address("tcp.akka", "sys", "a", 2552), Up)
val b1 = Member(Address("akka", "sys", "b", 2552), Up) val b1 = Member(Address("tcp.akka", "sys", "b", 2552), Up)
val c1 = Member(Address("akka", "sys", "c", 2552), Joining) val c1 = Member(Address("tcp.akka", "sys", "c", 2552), Joining)
val c2 = Member(Address("akka", "sys", "c", 2552), Up) val c2 = Member(Address("tcp.akka", "sys", "c", 2552), Up)
val d1 = Member(Address("akka", "sys", "a", 2551), Up) val d1 = Member(Address("tcp.akka", "sys", "a", 2551), Up)
val g0 = Gossip(members = SortedSet(a1)).seen(a1.address) val g0 = Gossip(members = SortedSet(a1)).seen(a1.address)
val g1 = Gossip(members = SortedSet(a1, b1, c1)).seen(a1.address).seen(b1.address).seen(c1.address) val g1 = Gossip(members = SortedSet(a1, b1, c1)).seen(a1.address).seen(b1.address).seen(c1.address)

26
akka-cluster/src/test/scala/akka/cluster/ClusterDomainEventSpec.scala
View file

@ -15,19 +15,19 @@ class ClusterDomainEventSpec extends WordSpec with MustMatchers {
import MemberStatus._ import MemberStatus._
import ClusterEvent._ import ClusterEvent._
val a1 = Member(Address("akka", "sys", "a", 2552), Up) val a1 = Member(Address("tcp.akka", "sys", "a", 2552), Up)
val a2 = Member(Address("akka", "sys", "a", 2552), Joining) val a2 = Member(Address("tcp.akka", "sys", "a", 2552), Joining)
val a3 = Member(Address("akka", "sys", "a", 2552), Removed) val a3 = Member(Address("tcp.akka", "sys", "a", 2552), Removed)
val b1 = Member(Address("akka", "sys", "b", 2552), Up) val b1 = Member(Address("tcp.akka", "sys", "b", 2552), Up)
val b2 = Member(Address("akka", "sys", "b", 2552), Removed) val b2 = Member(Address("tcp.akka", "sys", "b", 2552), Removed)
val b3 = Member(Address("akka", "sys", "b", 2552), Down) val b3 = Member(Address("tcp.akka", "sys", "b", 2552), Down)
val c1 = Member(Address("akka", "sys", "c", 2552), Leaving) val c1 = Member(Address("tcp.akka", "sys", "c", 2552), Leaving)
val c2 = Member(Address("akka", "sys", "c", 2552), Up) val c2 = Member(Address("tcp.akka", "sys", "c", 2552), Up)
val d1 = Member(Address("akka", "sys", "d", 2552), Leaving) val d1 = Member(Address("tcp.akka", "sys", "d", 2552), Leaving)
val d2 = Member(Address("akka", "sys", "d", 2552), Removed) val d2 = Member(Address("tcp.akka", "sys", "d", 2552), Removed)
val e1 = Member(Address("akka", "sys", "e", 2552), Joining) val e1 = Member(Address("tcp.akka", "sys", "e", 2552), Joining)
val e2 = Member(Address("akka", "sys", "e", 2552), Up) val e2 = Member(Address("tcp.akka", "sys", "e", 2552), Up)
val e3 = Member(Address("akka", "sys", "e", 2552), Down) val e3 = Member(Address("tcp.akka", "sys", "e", 2552), Down)
def converge(gossip: Gossip): (Gossip, Set[Address]) = def converge(gossip: Gossip): (Gossip, Set[Address]) =
((gossip, Set.empty[Address]) /: gossip.members) { (gs, m) ⇒ (gs._1.seen(m.address), gs._2 + m.address) } ((gossip, Set.empty[Address]) /: gossip.members) { (gs, m) ⇒ (gs._1.seen(m.address), gs._2 + m.address) }

12
akka-cluster/src/test/scala/akka/cluster/ClusterHeartbeatSenderStateSpec.scala
View file

@ -13,12 +13,12 @@ import scala.concurrent.duration._
@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
class ClusterHeartbeatSenderStateSpec extends WordSpec with MustMatchers { class ClusterHeartbeatSenderStateSpec extends WordSpec with MustMatchers {
val selfAddress = Address("akka", "sys", "myself", 2552) val selfAddress = Address("tcp.akka", "sys", "myself", 2552)
val aa = Address("akka", "sys", "aa", 2552) val aa = Address("tcp.akka", "sys", "aa", 2552)
val bb = Address("akka", "sys", "bb", 2552) val bb = Address("tcp.akka", "sys", "bb", 2552)
val cc = Address("akka", "sys", "cc", 2552) val cc = Address("tcp.akka", "sys", "cc", 2552)
val dd = Address("akka", "sys", "dd", 2552) val dd = Address("tcp.akka", "sys", "dd", 2552)
val ee = Address("akka", "sys", "ee", 2552) val ee = Address("tcp.akka", "sys", "ee", 2552)
val emptyState = ClusterHeartbeatSenderState.empty(ConsistentHash(Seq.empty[Address], 10), val emptyState = ClusterHeartbeatSenderState.empty(ConsistentHash(Seq.empty[Address], 10),
selfAddress.toString, 3) selfAddress.toString, 3)

22
akka-cluster/src/test/scala/akka/cluster/GossipSpec.scala
View file

@ -14,17 +14,17 @@ class GossipSpec extends WordSpec with MustMatchers {
import MemberStatus._ import MemberStatus._
val a1 = Member(Address("akka", "sys", "a", 2552), Up) val a1 = Member(Address("tcp.akka", "sys", "a", 2552), Up)
val a2 = Member(Address("akka", "sys", "a", 2552), Joining) val a2 = Member(Address("tcp.akka", "sys", "a", 2552), Joining)
val b1 = Member(Address("akka", "sys", "b", 2552), Up) val b1 = Member(Address("tcp.akka", "sys", "b", 2552), Up)
val b2 = Member(Address("akka", "sys", "b", 2552), Removed) val b2 = Member(Address("tcp.akka", "sys", "b", 2552), Removed)
val c1 = Member(Address("akka", "sys", "c", 2552), Leaving) val c1 = Member(Address("tcp.akka", "sys", "c", 2552), Leaving)
val c2 = Member(Address("akka", "sys", "c", 2552), Up) val c2 = Member(Address("tcp.akka", "sys", "c", 2552), Up)
val c3 = Member(Address("akka", "sys", "c", 2552), Exiting) val c3 = Member(Address("tcp.akka", "sys", "c", 2552), Exiting)
val d1 = Member(Address("akka", "sys", "d", 2552), Leaving) val d1 = Member(Address("tcp.akka", "sys", "d", 2552), Leaving)
val d2 = Member(Address("akka", "sys", "d", 2552), Removed) val d2 = Member(Address("tcp.akka", "sys", "d", 2552), Removed)
val e1 = Member(Address("akka", "sys", "e", 2552), Joining) val e1 = Member(Address("tcp.akka", "sys", "e", 2552), Joining)
val e2 = Member(Address("akka", "sys", "e", 2552), Up) val e2 = Member(Address("tcp.akka", "sys", "e", 2552), Up)
"A Gossip" must { "A Gossip" must {

20
akka-cluster/src/test/scala/akka/cluster/MemberOrderingSpec.scala
View file

@ -35,8 +35,8 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
"be sorted by address correctly" in { "be sorted by address correctly" in {
import Member.ordering import Member.ordering
// sorting should be done on host and port, only // sorting should be done on host and port, only
val m1 = Member(Address("akka", "sys1", "host1", 9000), MemberStatus.Up) val m1 = Member(Address("tcp.akka", "sys1", "host1", 9000), MemberStatus.Up)
val m2 = Member(Address("akka", "sys1", "host1", 10000), MemberStatus.Up) val m2 = Member(Address("tcp.akka", "sys1", "host1", 10000), MemberStatus.Up)
val m3 = Member(Address("cluster", "sys2", "host2", 8000), MemberStatus.Up) val m3 = Member(Address("cluster", "sys2", "host2", 8000), MemberStatus.Up)
val m4 = Member(Address("cluster", "sys2", "host2", 9000), MemberStatus.Up) val m4 = Member(Address("cluster", "sys2", "host2", 9000), MemberStatus.Up)
val m5 = Member(Address("cluster", "sys1", "host2", 10000), MemberStatus.Up) val m5 = Member(Address("cluster", "sys1", "host2", 10000), MemberStatus.Up)
@ -48,9 +48,9 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
} }
"have stable equals and hashCode" in { "have stable equals and hashCode" in {
val m1 = Member(Address("akka", "sys1", "host1", 9000), MemberStatus.Joining) val m1 = Member(Address("tcp.akka", "sys1", "host1", 9000), MemberStatus.Joining)
val m2 = Member(Address("akka", "sys1", "host1", 9000), MemberStatus.Up) val m2 = Member(Address("tcp.akka", "sys1", "host1", 9000), MemberStatus.Up)
val m3 = Member(Address("akka", "sys1", "host1", 10000), MemberStatus.Up) val m3 = Member(Address("tcp.akka", "sys1", "host1", 10000), MemberStatus.Up)
m1 must be(m2) m1 must be(m2)
m1.hashCode must be(m2.hashCode) m1.hashCode must be(m2.hashCode)
@ -60,8 +60,8 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
} }
"have consistent ordering and equals" in { "have consistent ordering and equals" in {
val address1 = Address("akka", "sys1", "host1", 9001) val address1 = Address("tcp.akka", "sys1", "host1", 9001)
val address2 = Address("akka", "sys1", "host1", 9002) val address2 = Address("tcp.akka", "sys1", "host1", 9002)
val x = Member(address1, Exiting) val x = Member(address1, Exiting)
val y = Member(address1, Removed) val y = Member(address1, Removed)
@ -71,9 +71,9 @@ class MemberOrderingSpec extends WordSpec with MustMatchers {
} }
"work with SortedSet" in { "work with SortedSet" in {
val address1 = Address("akka", "sys1", "host1", 9001) val address1 = Address("tcp.akka", "sys1", "host1", 9001)
val address2 = Address("akka", "sys1", "host1", 9002) val address2 = Address("tcp.akka", "sys1", "host1", 9002)
val address3 = Address("akka", "sys1", "host1", 9003) val address3 = Address("tcp.akka", "sys1", "host1", 9003)
(SortedSet(Member(address1, MemberStatus.Joining)) - Member(address1, MemberStatus.Up)) must be(SortedSet.empty[Member]) (SortedSet(Member(address1, MemberStatus.Joining)) - Member(address1, MemberStatus.Up)) must be(SortedSet.empty[Member])
(SortedSet(Member(address1, MemberStatus.Exiting)) - Member(address1, MemberStatus.Removed)) must be(SortedSet.empty[Member]) (SortedSet(Member(address1, MemberStatus.Exiting)) - Member(address1, MemberStatus.Removed)) must be(SortedSet.empty[Member])

4
akka-cluster/src/test/scala/akka/cluster/MetricValuesSpec.scala
View file

@ -14,8 +14,8 @@ class MetricValuesSpec extends AkkaSpec(MetricsEnabledSpec.config) with MetricsC
val collector = createMetricsCollector val collector = createMetricsCollector
val node1 = NodeMetrics(Address("akka", "sys", "a", 2554), 1, collector.sample.metrics) val node1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), 1, collector.sample.metrics)
val node2 = NodeMetrics(Address("akka", "sys", "a", 2555), 1, collector.sample.metrics) val node2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), 1, collector.sample.metrics)
val nodes: Seq[NodeMetrics] = { val nodes: Seq[NodeMetrics] = {
(1 to 100).foldLeft(List(node1, node2)) { (nodes, _) ⇒ (1 to 100).foldLeft(List(node1, node2)) { (nodes, _) ⇒

24
akka-cluster/src/test/scala/akka/cluster/MetricsGossipSpec.scala
View file

@ -18,8 +18,8 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
"A MetricsGossip" must { "A MetricsGossip" must {
"add new NodeMetrics" in { "add new NodeMetrics" in {
val m1 = NodeMetrics(Address("akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics) val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
val m2 = NodeMetrics(Address("akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics) val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
m1.metrics.size must be > (3) m1.metrics.size must be > (3)
m2.metrics.size must be > (3) m2.metrics.size must be > (3)
@ -35,8 +35,8 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
} }
"merge peer metrics" in { "merge peer metrics" in {
val m1 = NodeMetrics(Address("akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics) val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
val m2 = NodeMetrics(Address("akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics) val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
g1.nodes.size must be(2) g1.nodes.size must be(2)
@ -51,9 +51,9 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
} }
"merge an existing metric set for a node and update node ring" in { "merge an existing metric set for a node and update node ring" in {
val m1 = NodeMetrics(Address("akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics) val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
val m2 = NodeMetrics(Address("akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics) val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
val m3 = NodeMetrics(Address("akka", "sys", "a", 2556), newTimestamp, collector.sample.metrics) val m3 = NodeMetrics(Address("tcp.akka", "sys", "a", 2556), newTimestamp, collector.sample.metrics)
val m2Updated = m2 copy (metrics = collector.sample.metrics, timestamp = m2.timestamp + 1000) val m2Updated = m2 copy (metrics = collector.sample.metrics, timestamp = m2.timestamp + 1000)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
@ -72,14 +72,14 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
} }
"get the current NodeMetrics if it exists in the local nodes" in { "get the current NodeMetrics if it exists in the local nodes" in {
val m1 = NodeMetrics(Address("akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics) val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
val g1 = MetricsGossip.empty :+ m1 val g1 = MetricsGossip.empty :+ m1
g1.nodeMetricsFor(m1.address).map(_.metrics) must be(Some(m1.metrics)) g1.nodeMetricsFor(m1.address).map(_.metrics) must be(Some(m1.metrics))
} }
"remove a node if it is no longer Up" in { "remove a node if it is no longer Up" in {
val m1 = NodeMetrics(Address("akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics) val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
val m2 = NodeMetrics(Address("akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics) val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
g1.nodes.size must be(2) g1.nodes.size must be(2)
@ -91,8 +91,8 @@ class MetricsGossipSpec extends AkkaSpec(MetricsEnabledSpec.config) with Implici
} }
"filter nodes" in { "filter nodes" in {
val m1 = NodeMetrics(Address("akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics) val m1 = NodeMetrics(Address("tcp.akka", "sys", "a", 2554), newTimestamp, collector.sample.metrics)
val m2 = NodeMetrics(Address("akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics) val m2 = NodeMetrics(Address("tcp.akka", "sys", "a", 2555), newTimestamp, collector.sample.metrics)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
g1.nodes.size must be(2) g1.nodes.size must be(2)

4
akka-cluster/src/test/scala/akka/cluster/NodeMetricsSpec.scala
View file

@ -11,8 +11,8 @@ import akka.actor.Address
@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
class NodeMetricsSpec extends WordSpec with MustMatchers { class NodeMetricsSpec extends WordSpec with MustMatchers {
val node1 = Address("akka", "sys", "a", 2554) val node1 = Address("tcp.akka", "sys", "a", 2554)
val node2 = Address("akka", "sys", "a", 2555) val node2 = Address("tcp.akka", "sys", "a", 2555)
"NodeMetrics must" must { "NodeMetrics must" must {

8
akka-cluster/src/test/scala/akka/cluster/routing/MetricsSelectorSpec.scala
View file

@ -19,10 +19,10 @@ class MetricsSelectorSpec extends WordSpec with MustMatchers {
override def capacity(nodeMetrics: Set[NodeMetrics]): Map[Address, Double] = Map.empty override def capacity(nodeMetrics: Set[NodeMetrics]): Map[Address, Double] = Map.empty
} }
val a1 = Address("akka", "sys", "a1", 2551) val a1 = Address("tcp.akka", "sys", "a1", 2551)
val b1 = Address("akka", "sys", "b1", 2551) val b1 = Address("tcp.akka", "sys", "b1", 2551)
val c1 = Address("akka", "sys", "c1", 2551) val c1 = Address("tcp.akka", "sys", "c1", 2551)
val d1 = Address("akka", "sys", "d1", 2551) val d1 = Address("tcp.akka", "sys", "d1", 2551)
val decayFactor = Some(0.18) val decayFactor = Some(0.18)

8
akka-cluster/src/test/scala/akka/cluster/routing/WeightedRouteesSpec.scala
View file

@ -16,10 +16,10 @@ class WeightedRouteesSpec extends AkkaSpec(ConfigFactory.parseString("""
akka.remote.netty.port = 0 akka.remote.netty.port = 0
""")) { """)) {
val a1 = Address("akka", "sys", "a1", 2551) val a1 = Address("tcp.akka", "sys", "a1", 2551)
val b1 = Address("akka", "sys", "b1", 2551) val b1 = Address("tcp.akka", "sys", "b1", 2551)
val c1 = Address("akka", "sys", "c1", 2551) val c1 = Address("tcp.akka", "sys", "c1", 2551)
val d1 = Address("akka", "sys", "d1", 2551) val d1 = Address("tcp.akka", "sys", "d1", 2551)
val refA = system.actorFor(RootActorPath(a1) / "user" / "a") val refA = system.actorFor(RootActorPath(a1) / "user" / "a")
val refB = system.actorFor(RootActorPath(b1) / "user" / "b") val refB = system.actorFor(RootActorPath(b1) / "user" / "b")