Make artery the default remoting (#26772)

This commit is contained in:
Christopher Batey 2019-05-01 08:12:09 +01:00 committed by GitHub
parent ac91c797a5
commit efc3adc08d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
158 changed files with 977 additions and 999 deletions

View file

@ -23,11 +23,12 @@ object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
val fifth = role("fifth")
commonConfig(
ConfigFactory.parseString("""
ConfigFactory
.parseString("""
akka.loglevel = DEBUG # issue #24955
akka.cluster.debug.verbose-heartbeat-logging = on
akka.cluster.debug.verbose-gossip-logging = on
akka.remote.netty.tcp.connection-timeout = 5 s # speedup in case of connection issue
akka.remote.classic.netty.tcp.connection-timeout = 5 s # speedup in case of connection issue
akka.remote.retry-gate-closed-for = 1 s
akka.cluster.multi-data-center {
failure-detector {
@ -40,7 +41,8 @@ object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
leader-actions-interval = 1s
auto-down-unreachable-after = 1s
}
""").withFallback(MultiNodeClusterSpec.clusterConfig))
""")
.withFallback(MultiNodeClusterSpec.clusterConfig))
nodeConfig(first, second)(ConfigFactory.parseString("""
akka.cluster.multi-data-center.self-data-center = "dc1"
@ -240,7 +242,7 @@ abstract class MultiDcSplitBrainSpec extends MultiNodeSpec(MultiDcSplitBrainMult
val restartedSystem = ActorSystem(
system.name,
ConfigFactory.parseString(s"""
akka.remote.netty.tcp.port = $port
akka.remote.classic.netty.tcp.port = $port
akka.remote.artery.canonical.port = $port
akka.coordinated-shutdown.terminate-actor-system = on
""").withFallback(system.settings.config))