raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

format source with scalafmt

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

27
akka-cluster/src/multi-jvm/scala/akka/cluster/MultiDcSplitBrainSpec.scala
View file

@ -22,8 +22,8 @@ object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
val fourth = role("fourth")
val fifth = role("fifth")
commonConfig(ConfigFactory.parseString(
"""
commonConfig(
ConfigFactory.parseString("""
akka.loglevel = DEBUG # issue #24955
akka.cluster.debug.verbose-heartbeat-logging = on
akka.cluster.debug.verbose-gossip-logging = on
@ -42,13 +42,11 @@ object MultiDcSplitBrainMultiJvmSpec extends MultiNodeConfig {
}
""").withFallback(MultiNodeClusterSpec.clusterConfig))
nodeConfig(first, second)(ConfigFactory.parseString(
"""
nodeConfig(first, second)(ConfigFactory.parseString("""
akka.cluster.multi-data-center.self-data-center = "dc1"
"""))
nodeConfig(third, fourth, fifth)(ConfigFactory.parseString(
"""
nodeConfig(third, fourth, fifth)(ConfigFactory.parseString("""
akka.cluster.multi-data-center.self-data-center = "dc2"
"""))
@ -61,9 +59,7 @@ class MultiDcSplitBrainMultiJvmNode3 extends MultiDcSplitBrainSpec
class MultiDcSplitBrainMultiJvmNode4 extends MultiDcSplitBrainSpec
class MultiDcSplitBrainMultiJvmNode5 extends MultiDcSplitBrainSpec
abstract class MultiDcSplitBrainSpec
extends MultiNodeSpec(MultiDcSplitBrainMultiJvmSpec)
with MultiNodeClusterSpec {
abstract class MultiDcSplitBrainSpec extends MultiNodeSpec(MultiDcSplitBrainMultiJvmSpec) with MultiNodeClusterSpec {
import MultiDcSplitBrainMultiJvmSpec._
@ -196,7 +192,8 @@ abstract class MultiDcSplitBrainSpec
// forth has left the cluster, fifth is still not a member
"be able to have data center member restart (same host:port) while there is inter data center split" in within(60.seconds) {
"be able to have data center member restart (same host:port) while there is inter data center split" in within(
60.seconds) {
val subscribeProbe = TestProbe()
runOn(first, second, third, fifth) {
Cluster(system).subscribe(subscribeProbe.ref, InitialStateAsSnapshot, classOf[MemberUp], classOf[MemberRemoved])
@ -212,7 +209,9 @@ abstract class MultiDcSplitBrainSpec
awaitAssert(clusterView.members.collect {
case m if m.dataCenter == "dc2" && m.status == MemberStatus.Up => m.address
} should ===(Set(address(third), address(fifth))))
fifthOriginalUniqueAddress = clusterView.members.collectFirst { case m if m.address == address(fifth) => m.uniqueAddress }
fifthOriginalUniqueAddress = clusterView.members.collectFirst {
case m if m.address == address(fifth) => m.uniqueAddress
}
}
enterBarrier("fifth-joined")
@ -238,10 +237,8 @@ abstract class MultiDcSplitBrainSpec
Await.ready(system.whenTerminated, remaining)
val port = Cluster(system).selfAddress.port.get
val restartedSystem = ActorSystem(
system.name,
ConfigFactory.parseString(
s"""
val restartedSystem = ActorSystem(system.name,
ConfigFactory.parseString(s"""
akka.remote.netty.tcp.port = $port
akka.remote.artery.canonical.port = $port
akka.coordinated-shutdown.terminate-actor-system = on