Move coordinated-shutdown config from test/resources, #23879

* looks like the ActorSystem is shutdown when leaving
* Included in MultiNodeSpec, i.e. all multi-node tests:
  akka.coordinated-shutdown.terminate-actor-system = off
  akka.oordinated-shutdown.run-by-jvm-shutdown-hook = off
This commit is contained in:
Patrik Nordwall 2017-11-07 15:38:35 +01:00
parent 3bc627d766
commit 436668687a
8 changed files with 3 additions and 16 deletions

View file

@ -5,6 +5,3 @@ akka {
}
}
akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off
akka.coordinated-shutdown.terminate-actor-system = off
akka.cluster.run-coordinated-shutdown-when-down = off

View file

@ -5,6 +5,3 @@ akka {
}
}
akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off
akka.coordinated-shutdown.terminate-actor-system = off
akka.cluster.run-coordinated-shutdown-when-down = off

View file

@ -5,6 +5,3 @@ akka {
}
}
akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off
akka.coordinated-shutdown.terminate-actor-system = off
akka.cluster.run-coordinated-shutdown-when-down = off

View file

@ -21,7 +21,6 @@ class MultiDcSpecConfig(crossDcConnections: Int = 5) extends MultiNodeConfig {
s"""
# DEBUG On for issue #23864
akka.loglevel = DEBUG
akka.coordinated-shutdown.terminate-actor-system = off
akka.cluster.multi-data-center.cross-data-center-connections = $crossDcConnections
""").withFallback(MultiNodeClusterSpec.clusterConfig))

View file

@ -46,6 +46,8 @@ object MultiNodeClusterSpec {
periodic-tasks-initial-delay = 300 ms
publish-stats-interval = 0 s # always, when it happens
failure-detector.heartbeat-interval = 500 ms
run-coordinated-shutdown-when-down = off
}
akka.loglevel = INFO
akka.log-dead-letters = off

View file

@ -5,7 +5,4 @@ akka {
}
}
akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off
akka.coordinated-shutdown.terminate-actor-system = off
akka.cluster.run-coordinated-shutdown-when-down = off

View file

@ -3,6 +3,3 @@ akka.actor {
warn-about-java-serializer-usage = off
}
akka.coordinated-shutdown.run-by-jvm-shutdown-hook = off
akka.coordinated-shutdown.terminate-actor-system = off
akka.cluster.run-coordinated-shutdown-when-down = off

View file

@ -217,6 +217,7 @@ object MultiNodeSpec {
loggers = ["akka.testkit.TestEventListener"]
loglevel = "WARNING"
stdout-loglevel = "WARNING"
coordinated-shutdown.terminate-actor-system = off
coordinated-shutdown.run-by-jvm-shutdown-hook = off
actor {
default-dispatcher {