From 436668687ae8da6703871e9e31068688e9ff1dda Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Tue, 7 Nov 2017 15:38:35 +0100
Subject: [PATCH] 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
---
 akka-cluster-metrics/src/test/resources/reference.conf         | 3 ---
 akka-cluster-sharding/src/test/resources/reference.conf        | 3 ---
 akka-cluster-tools/src/test/resources/reference.conf           | 3 ---
 .../src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala  | 1 -
 .../multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala    | 2 ++
 akka-cluster/src/test/resources/reference.conf                 | 3 ---
 akka-distributed-data/src/test/resources/reference.conf        | 3 ---
 .../src/main/scala/akka/remote/testkit/MultiNodeSpec.scala     | 1 +
 8 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/akka-cluster-metrics/src/test/resources/reference.conf b/akka-cluster-metrics/src/test/resources/reference.conf
index a1062f1ec4..c55b6c276f 100644
--- a/akka-cluster-metrics/src/test/resources/reference.conf
+++ b/akka-cluster-metrics/src/test/resources/reference.conf
@@ -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
diff --git a/akka-cluster-sharding/src/test/resources/reference.conf b/akka-cluster-sharding/src/test/resources/reference.conf
index a1062f1ec4..c55b6c276f 100644
--- a/akka-cluster-sharding/src/test/resources/reference.conf
+++ b/akka-cluster-sharding/src/test/resources/reference.conf
@@ -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
diff --git a/akka-cluster-tools/src/test/resources/reference.conf b/akka-cluster-tools/src/test/resources/reference.conf
index a1062f1ec4..c55b6c276f 100644
--- a/akka-cluster-tools/src/test/resources/reference.conf
+++ b/akka-cluster-tools/src/test/resources/reference.conf
@@ -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
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala
index 935534cde3..b20a6d5852 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcClusterSpec.scala
@@ -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))
 
diff --git a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
index c77200d270..119a7afd69 100644
--- a/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
+++ b/akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
@@ -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
diff --git a/akka-cluster/src/test/resources/reference.conf b/akka-cluster/src/test/resources/reference.conf
index 8187d87d94..b7b9343137 100644
--- a/akka-cluster/src/test/resources/reference.conf
+++ b/akka-cluster/src/test/resources/reference.conf
@@ -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
 
diff --git a/akka-distributed-data/src/test/resources/reference.conf b/akka-distributed-data/src/test/resources/reference.conf
index d629bb4b53..cd91912673 100644
--- a/akka-distributed-data/src/test/resources/reference.conf
+++ b/akka-distributed-data/src/test/resources/reference.conf
@@ -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
diff --git a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
index ba88b2a45e..a8ffeeb90e 100644
--- a/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
+++ b/akka-multi-node-testkit/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
@@ -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 {