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

Revert "Less abbreviations, more reliable test"

Browse source 
This reverts commit 61e289b276f410654c1b063c33648e0d7ea88e50.
This commit is contained in:
Patrik Nordwall 2017-07-03 10:44:24 +02:00
parent 9bd27a2459
commit bd6afb8952
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-cluster/src/main/resources/reference.conf
View file

@ -65,8 +65,8 @@ akka {
# move 'WeaklyUp' members to 'Up' status once convergence has been reached.
allow-weakly-up-members = on
# Teams are used to make islands of the cluster that are colocated. This can be used
# to make the cluster aware that it is running across multiple availability zones or regions.
# Teams are used to make islands of the cluster that are colocated. It can be used
# to make the cluster "dc-aware", run the cluster in multiple availability zones or regions.
# The team is added to the list of roles of the node with the prefix "team-".
team = "default"

2
akka-cluster/src/main/scala/akka/cluster/ClusterJmx.scala
View file

@ -154,7 +154,7 @@ private[akka] class ClusterJmx(cluster: Cluster, log: LoggingAdapter) {
val members = clusterView.members.toSeq.sorted(Member.ordering).map { m ⇒
s"""{
| "address": "${m.address}",
| "roles": [${if (m.roles.isEmpty) "" else m.roles.toList.sorted.map("\"" + _ + "\"").mkString("\n ", ",\n ", "\n ")}],
| "roles": [${if (m.roles.isEmpty) "" else m.roles.map("\"" + _ + "\"").mkString("\n ", ",\n ", "\n ")}],
| "status": "${m.status}"
| }""".stripMargin
} mkString (",\n ")

2
akka-cluster/src/main/scala/akka/cluster/Member.scala
View file

@ -22,7 +22,7 @@ class Member private[cluster] (
val status: MemberStatus,
val roles: Set[String]) extends Serializable {
lazy val team: String = roles.find(_.startsWith("team-"))
lazy val team = roles.find(_.startsWith("team-"))
.getOrElse(throw new IllegalStateException("Team undefined, should not be possible"))
def address: Address = uniqueAddress.address

16
akka-cluster/src/multi-jvm/scala/akka/cluster/MBeanSpec.scala
View file

@ -120,32 +120,32 @@ abstract class MBeanSpec
| {
| "address": "${sortedNodes(0)}",
| "roles": [
| "team-default",
| "testNode"
| "testNode",
| "team-default"
| ],
| "status": "Up"
| },
| {
| "address": "${sortedNodes(1)}",
| "roles": [
| "team-default",
| "testNode"
| "testNode",
| "team-default"
| ],
| "status": "Up"
| },
| {
| "address": "${sortedNodes(2)}",
| "roles": [
| "team-default",
| "testNode"
| "testNode",
| "team-default"
| ],
| "status": "Up"
| },
| {
| "address": "${sortedNodes(3)}",
| "roles": [
| "team-default",
| "testNode"
| "testNode",
| "team-default"
| ],
| "status": "Up"
| }