format source with scalafmt

This commit is contained in:
Auto Format 2019-03-11 10:38:24 +01:00 committed by Patrik Nordwall
parent 0f40491d42
commit ce404e4f53
1669 changed files with 43208 additions and 35404 deletions

View file

@ -24,15 +24,14 @@ object RestartNode2SpecMultiJvmSpec extends MultiNodeConfig {
val seed1 = role("seed1")
val seed2 = role("seed2")
commonConfig(debugConfig(on = false).
withFallback(ConfigFactory.parseString("""
commonConfig(
debugConfig(on = false).withFallback(ConfigFactory.parseString("""
akka.cluster.auto-down-unreachable-after = 2s
akka.cluster.retry-unsuccessful-join-after = 3s
akka.cluster.allow-weakly-up-members = off
akka.remote.retry-gate-closed-for = 45s
akka.remote.log-remote-lifecycle-events = INFO
""")).
withFallback(MultiNodeClusterSpec.clusterConfig))
""")).withFallback(MultiNodeClusterSpec.clusterConfig))
}
@ -40,8 +39,9 @@ class RestartNode2SpecMultiJvmNode1 extends RestartNode2SpecSpec
class RestartNode2SpecMultiJvmNode2 extends RestartNode2SpecSpec
abstract class RestartNode2SpecSpec
extends MultiNodeSpec(RestartNode2SpecMultiJvmSpec)
with MultiNodeClusterSpec with ImplicitSender {
extends MultiNodeSpec(RestartNode2SpecMultiJvmSpec)
with MultiNodeClusterSpec
with ImplicitSender {
import RestartNode2SpecMultiJvmSpec._
@ -53,10 +53,8 @@ abstract class RestartNode2SpecSpec
def seedNodes: immutable.IndexedSeq[Address] = Vector(seedNode1Address, seed2)
// this is the node that will attempt to re-join, keep gate times low so it can retry quickly
lazy val restartedSeed1System = ActorSystem(
system.name,
ConfigFactory.parseString(
s"""
lazy val restartedSeed1System = ActorSystem(system.name,
ConfigFactory.parseString(s"""
akka.remote.netty.tcp.port = ${seedNodes.head.port.get}
akka.remote.artery.canonical.port = ${seedNodes.head.port.get}
#akka.remote.retry-gate-closed-for = 1s
@ -64,8 +62,7 @@ abstract class RestartNode2SpecSpec
override def afterAll(): Unit = {
runOn(seed1) {
shutdown(
if (seed1System.whenTerminated.isCompleted) restartedSeed1System else seed1System)
shutdown(if (seed1System.whenTerminated.isCompleted) restartedSeed1System else seed1System)
}
super.afterAll()
}
@ -88,7 +85,7 @@ abstract class RestartNode2SpecSpec
runOn(seed1) {
enterBarrier("seed1-address-receiver-ready")
seedNode1Address = Cluster(seed1System).selfAddress
List(seed2) foreach { r =>
List(seed2).foreach { r =>
system.actorSelection(RootActorPath(r) / "user" / "address-receiver") ! seedNode1Address
expectMsg(5.seconds, "ok")
}