From b0e03058b922cdd1f01907f438f74cab4bc56876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Fri, 9 Sep 2016 17:55:02 +0200 Subject: [PATCH] Port and hostname config path was changed, cluster tests didn't get the change (#21427) --- .../src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala | 2 +- .../multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala | 2 +- .../src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala index 5bc53ba4c7..ab973898d3 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/QuickRestartSpec.scala @@ -72,7 +72,7 @@ abstract class QuickRestartSpec if (RARP(system).provider.remoteSettings.Artery.Enabled) s""" akka.cluster.roles = [round-$n] - akka.remote.artery.port = ${Cluster(restartingSystem).selfAddress.port.get} + akka.remote.artery.canonical.port = ${Cluster(restartingSystem).selfAddress.port.get} """ else s""" diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala index adada79382..313bc3b245 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartFirstSeedNodeSpec.scala @@ -56,7 +56,7 @@ abstract class RestartFirstSeedNodeSpec system.name, ConfigFactory.parseString( if (RARP(system).provider.remoteSettings.Artery.Enabled) - "akka.remote.artery.port=" + seedNodes.head.port.get + "akka.remote.artery.canonical.port=" + seedNodes.head.port.get else "akka.remote.netty.tcp.port=" + seedNodes.head.port.get ).withFallback(system.settings.config)) diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala index 652923602c..895b3fb5bf 100644 --- a/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala +++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/RestartNode3Spec.scala @@ -52,7 +52,7 @@ abstract class RestartNode3Spec system.name, ConfigFactory.parseString( if (RARP(system).provider.remoteSettings.Artery.Enabled) - "akka.remote.artery.port=" + secondUniqueAddress.address.port.get + "akka.remote.artery.canonical.port=" + secondUniqueAddress.address.port.get else "akka.remote.netty.tcp.port=" + secondUniqueAddress.address.port.get ).withFallback(system.settings.config))