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

change 2552+ port numbers

Browse source
This commit is contained in:
PJ Fanning 2023-03-06 12:29:03 +01:00 • committed by kerr
parent 785369030d
commit 1969f7580d
11 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

32
cluster-metrics/src/test/scala/org/apache/pekko/cluster/metrics/MetricSpec.scala
View file

@ -69,8 +69,8 @@ class MetricNumericConverterSpec extends AnyWordSpec with Matchers with MetricNu
@nowarn @nowarn
class NodeMetricsSpec extends AnyWordSpec with Matchers { class NodeMetricsSpec extends AnyWordSpec with Matchers {
val node1 = Address("pekko", "sys", "a", 2554) val node1 = Address("pekko", "sys", "a", 7357)
val node2 = Address("pekko", "sys", "a", 2555) val node2 = Address("pekko", "sys", "a", 7358)
"NodeMetrics must" must { "NodeMetrics must" must {
@ -162,8 +162,8 @@ class MetricsGossipSpec
"A MetricsGossip" must { "A MetricsGossip" must {
"add new NodeMetrics" in { "add new NodeMetrics" in {
val m1 = NodeMetrics(Address("pekko", "sys", "a", 2554), newTimestamp, collector.sample().metrics) val m1 = NodeMetrics(Address("pekko", "sys", "a", 7357), newTimestamp, collector.sample().metrics)
val m2 = NodeMetrics(Address("pekko", "sys", "a", 2555), newTimestamp, collector.sample().metrics) val m2 = NodeMetrics(Address("pekko", "sys", "a", 7358), newTimestamp, collector.sample().metrics)
m1.metrics.size should be > 3 m1.metrics.size should be > 3
m2.metrics.size should be > 3 m2.metrics.size should be > 3
@ -179,8 +179,8 @@ class MetricsGossipSpec
} }
"merge peer metrics" in { "merge peer metrics" in {
val m1 = NodeMetrics(Address("pekko", "sys", "a", 2554), newTimestamp, collector.sample().metrics) val m1 = NodeMetrics(Address("pekko", "sys", "a", 7357), newTimestamp, collector.sample().metrics)
val m2 = NodeMetrics(Address("pekko", "sys", "a", 2555), newTimestamp, collector.sample().metrics) val m2 = NodeMetrics(Address("pekko", "sys", "a", 7358), newTimestamp, collector.sample().metrics)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
g1.nodes.size should ===(2) g1.nodes.size should ===(2)
@ -194,9 +194,9 @@ class MetricsGossipSpec
} }
"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("pekko", "sys", "a", 2554), newTimestamp, collector.sample().metrics) val m1 = NodeMetrics(Address("pekko", "sys", "a", 7357), newTimestamp, collector.sample().metrics)
val m2 = NodeMetrics(Address("pekko", "sys", "a", 2555), newTimestamp, collector.sample().metrics) val m2 = NodeMetrics(Address("pekko", "sys", "a", 7358), newTimestamp, collector.sample().metrics)
val m3 = NodeMetrics(Address("pekko", "sys", "a", 2556), newTimestamp, collector.sample().metrics) val m3 = NodeMetrics(Address("pekko", "sys", "a", 7359), newTimestamp, collector.sample().metrics)
val m2Updated = m2.copy(metrics = newSample(m2.metrics), timestamp = m2.timestamp + 1000) val m2Updated = m2.copy(metrics = newSample(m2.metrics), timestamp = m2.timestamp + 1000)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
@ -215,14 +215,14 @@ class MetricsGossipSpec
} }
"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("pekko", "sys", "a", 2554), newTimestamp, collector.sample().metrics) val m1 = NodeMetrics(Address("pekko", "sys", "a", 7357), newTimestamp, collector.sample().metrics)
val g1 = MetricsGossip.empty :+ m1 val g1 = MetricsGossip.empty :+ m1
g1.nodeMetricsFor(m1.address).map(_.metrics) should ===(Some(m1.metrics)) g1.nodeMetricsFor(m1.address).map(_.metrics) should ===(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("pekko", "sys", "a", 2554), newTimestamp, collector.sample().metrics) val m1 = NodeMetrics(Address("pekko", "sys", "a", 7357), newTimestamp, collector.sample().metrics)
val m2 = NodeMetrics(Address("pekko", "sys", "a", 2555), newTimestamp, collector.sample().metrics) val m2 = NodeMetrics(Address("pekko", "sys", "a", 7358), newTimestamp, collector.sample().metrics)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
g1.nodes.size should ===(2) g1.nodes.size should ===(2)
@ -234,8 +234,8 @@ class MetricsGossipSpec
} }
"filter nodes" in { "filter nodes" in {
val m1 = NodeMetrics(Address("pekko", "sys", "a", 2554), newTimestamp, collector.sample().metrics) val m1 = NodeMetrics(Address("pekko", "sys", "a", 7357), newTimestamp, collector.sample().metrics)
val m2 = NodeMetrics(Address("pekko", "sys", "a", 2555), newTimestamp, collector.sample().metrics) val m2 = NodeMetrics(Address("pekko", "sys", "a", 7358), newTimestamp, collector.sample().metrics)
val g1 = MetricsGossip.empty :+ m1 :+ m2 val g1 = MetricsGossip.empty :+ m1 :+ m2
g1.nodes.size should ===(2) g1.nodes.size should ===(2)
@ -254,8 +254,8 @@ class MetricValuesSpec extends PekkoSpec(MetricsConfig.defaultEnabled) with Metr
val collector = createMetricsCollector val collector = createMetricsCollector
val node1 = NodeMetrics(Address("pekko", "sys", "a", 2554), 1, collector.sample().metrics) val node1 = NodeMetrics(Address("pekko", "sys", "a", 7357), 1, collector.sample().metrics)
val node2 = NodeMetrics(Address("pekko", "sys", "a", 2555), 1, collector.sample().metrics) val node2 = NodeMetrics(Address("pekko", "sys", "a", 7358), 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, _) =>

4
cluster/src/test/scala/org/apache/pekko/cluster/ClusterSpec.scala
View file

@ -358,7 +358,7 @@ class ClusterSpec extends PekkoSpec(ClusterSpec.config) with ImplicitSender {
""").withFallback(ConfigFactory.parseString(ClusterSpec.config)) """).withFallback(ConfigFactory.parseString(ClusterSpec.config))
val sys1 = ActorSystem("ClusterSpec4", getConfig(7355)) val sys1 = ActorSystem("ClusterSpec4", getConfig(7355))
val sys2 = ActorSystem("ClusterSpec4", getConfig(2553)) val sys2 = ActorSystem("ClusterSpec4", getConfig(7356))
try { try {
Cluster(sys1) Cluster(sys1)
@ -369,7 +369,7 @@ class ClusterSpec extends PekkoSpec(ClusterSpec.config) with ImplicitSender {
info1.getAttributes.length should be > 0 info1.getAttributes.length should be > 0
info1.getOperations.length should be > 0 info1.getOperations.length should be > 0
val name2 = new ObjectName(s"pekko:type=Cluster,port=2553") val name2 = new ObjectName(s"pekko:type=Cluster,port=7356")
val info2 = ManagementFactory.getPlatformMBeanServer.getMBeanInfo(name2) val info2 = ManagementFactory.getPlatformMBeanServer.getMBeanInfo(name2)
info2.getAttributes.length should be > 0 info2.getAttributes.length should be > 0
info2.getOperations.length should be > 0 info2.getOperations.length should be > 0

4
distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/DataEnvelopeSpec.scala
View file

@ -26,8 +26,8 @@ class DataEnvelopeSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L) val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L) val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L)
val node3 = UniqueAddress(node1.address.copy(port = Some(2553)), 3L) val node3 = UniqueAddress(node1.address.copy(port = Some(7356)), 3L)
val node4 = UniqueAddress(node1.address.copy(port = Some(2554)), 4L) val node4 = UniqueAddress(node1.address.copy(port = Some(7357)), 4L)
val obsoleteTimeInFuture = System.currentTimeMillis() + 3600 * 1000 val obsoleteTimeInFuture = System.currentTimeMillis() + 3600 * 1000
val oldObsoleteTime = System.currentTimeMillis() - 3600 * 1000 val oldObsoleteTime = System.currentTimeMillis() - 3600 * 1000

2
distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/GCounterSpec.scala
View file

@ -24,7 +24,7 @@ import pekko.cluster.ddata.Replicator.Changed
class GCounterSpec extends AnyWordSpec with Matchers { class GCounterSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L) val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L) val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L)
val node3 = UniqueAddress(node1.address.copy(port = Some(2553)), 3L) val node3 = UniqueAddress(node1.address.copy(port = Some(7356)), 3L)
"A GCounter" must { "A GCounter" must {

2
distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/ORSetSpec.scala
View file

@ -27,7 +27,7 @@ class ORSetSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L) val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L) val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L)
val node3 = UniqueAddress(node1.address.copy(port = Some(2553)), 3L) val node3 = UniqueAddress(node1.address.copy(port = Some(7356)), 3L)
val nodeA = UniqueAddress(Address("pekko", "Sys", "a", 7355), 1L) val nodeA = UniqueAddress(Address("pekko", "Sys", "a", 7355), 1L)
val nodeB = UniqueAddress(nodeA.address.copy(host = Some("b")), 2L) val nodeB = UniqueAddress(nodeA.address.copy(host = Some("b")), 2L)

4
distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/PruningStateSpec.scala
View file

@ -25,8 +25,8 @@ class PruningStateSpec extends AnyWordSpec with Matchers {
val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L) val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L) val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L)
val node3 = UniqueAddress(node1.address.copy(port = Some(2553)), 3L) val node3 = UniqueAddress(node1.address.copy(port = Some(7356)), 3L)
val node4 = UniqueAddress(node1.address.copy(port = Some(2554)), 4L) val node4 = UniqueAddress(node1.address.copy(port = Some(7357)), 4L)
"Pruning state" must { "Pruning state" must {

4
distributed-data/src/test/scala/org/apache/pekko/cluster/ddata/VersionVectorSpec.scala
View file

@ -31,8 +31,8 @@ class VersionVectorSpec
val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L) val node1 = UniqueAddress(Address("pekko", "Sys", "localhost", 2551), 1L)
val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L) val node2 = UniqueAddress(node1.address.copy(port = Some(7355)), 2L)
val node3 = UniqueAddress(node1.address.copy(port = Some(2553)), 3L) val node3 = UniqueAddress(node1.address.copy(port = Some(7356)), 3L)
val node4 = UniqueAddress(node1.address.copy(port = Some(2554)), 4L) val node4 = UniqueAddress(node1.address.copy(port = Some(7357)), 4L)
override def afterAll(): Unit = { override def afterAll(): Unit = {
shutdown() shutdown()

4
docs/src/main/paradox/remoting.md
View file

@ -190,7 +190,7 @@ pekko {
actor { actor {
deployment { deployment {
/sampleActor { /sampleActor {
remote = "pekko.tcp://sampleActorSystem@127.0.0.1:2553" remote = "pekko.tcp://sampleActorSystem@127.0.0.1:7356"
} }
} }
} }
@ -200,7 +200,7 @@ pekko {
The configuration above instructs Pekko to react when an actor with path `/sampleActor` is created, i.e. The configuration above instructs Pekko to react when an actor with path `/sampleActor` is created, i.e.
using @scala[`system.actorOf(Props(...), "sampleActor")`]@java[`system.actorOf(new Props(...), "sampleActor")`]. This specific actor will not be directly instantiated, using @scala[`system.actorOf(Props(...), "sampleActor")`]@java[`system.actorOf(new Props(...), "sampleActor")`]. This specific actor will not be directly instantiated,
but instead the remote daemon of the remote system will be asked to create the actor, but instead the remote daemon of the remote system will be asked to create the actor,
which in this sample corresponds to `sampleActorSystem@127.0.0.1:2553`. which in this sample corresponds to `sampleActorSystem@127.0.0.1:7356`.
Once you have configured the properties above you would do the following in code: Once you have configured the properties above you would do the following in code:

2
docs/src/test/scala/docs/config/ConfigDocSpec.scala
View file

@ -78,7 +78,7 @@ class ConfigDocSpec extends AnyWordSpec with Matchers {
# '/user/actorA/actorB' is a remote deployed actor # '/user/actorA/actorB' is a remote deployed actor
/actorA/actorB { /actorA/actorB {
remote = "pekko://sampleActorSystem@127.0.0.1:2553" remote = "pekko://sampleActorSystem@127.0.0.1:7356"
} }
# all direct children of '/user/actorC' have a dedicated dispatcher # all direct children of '/user/actorC' have a dedicated dispatcher

8
remote/src/main/resources/reference.conf
View file

@ -513,8 +513,8 @@ pekko {
# Use 0 if you want a random available port. Examples: # Use 0 if you want a random available port. Examples:
# #
# pekko.remote.classic.netty.tcp.port = 7355 # pekko.remote.classic.netty.tcp.port = 7355
# pekko.remote.classic.netty.tcp.bind-port = 2553 # pekko.remote.classic.netty.tcp.bind-port = 7356
# Network interface will be bound to the 2553 port, but remoting protocol will # Network interface will be bound to the 7356 port, but remoting protocol will
# expect messages sent to port 7355. # expect messages sent to port 7355.
# #
# pekko.remote.classic.netty.tcp.port = 0 # pekko.remote.classic.netty.tcp.port = 0
@ -528,8 +528,8 @@ pekko {
# expect messages sent to port 7355. # expect messages sent to port 7355.
# #
# pekko.remote.classic.netty.tcp.port = 0 # pekko.remote.classic.netty.tcp.port = 0
# pekko.remote.classic.netty.tcp.bind-port = 2553 # pekko.remote.classic.netty.tcp.bind-port = 7356
# Network interface will be bound to the 2553 port, and remoting protocol will # Network interface will be bound to the 7356 port, and remoting protocol will
# expect messages sent to the bound port. # expect messages sent to the bound port.
# #
# pekko.remote.classic.netty.tcp.port = 7355 # pekko.remote.classic.netty.tcp.port = 7355

2
remote/src/test/scala/org/apache/pekko/remote/classic/ActorsLeakSpec.scala
View file

@ -124,7 +124,7 @@ class ActorsLeakSpec extends PekkoSpec(ActorsLeakSpec.config) with ImplicitSende
"remote", "remote",
ConfigFactory.parseString(""" ConfigFactory.parseString("""
pekko.remote.artery.enabled = false pekko.remote.artery.enabled = false
pekko.remote.classic.netty.tcp.port = 2553 pekko.remote.classic.netty.tcp.port = 7356
""".stripMargin).withFallback(config)) """.stripMargin).withFallback(config))
try { try {