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

Merge pull request #1765 from akka/wip-3636-revert-join-uninitialized-patriknw

Browse source 
+clu #3636 Revert join to uninitialized
This commit is contained in:
Patrik Nordwall 2013-10-15 07:07:29 -07:00
commit 81ca6fe8c8
4 changed files with 32 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-cluster/src/main/scala/akka/cluster/ClusterDaemon.scala
View file

@ -294,7 +294,6 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef) extends Actor with
case InitJoin ⇒ sender ! InitJoinNack(selfAddress)
case ClusterUserAction.JoinTo(address) ⇒ join(address)
case JoinSeedNodes(seedNodes) ⇒ joinSeedNodes(seedNodes)
case Join(node, roles) ⇒ joiningUninitialized(node, roles)
case msg: SubscriptionMessage ⇒ publisher forward msg
}
@ -307,7 +306,6 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef) extends Actor with
case JoinSeedNodes(seedNodes) ⇒
becomeUninitialized()
joinSeedNodes(seedNodes)
case Join(node, roles) ⇒ joiningUninitialized(node, roles)
case msg: SubscriptionMessage ⇒ publisher forward msg
case _: Tick ⇒
if (deadline.exists(_.isOverdue)) {
@ -476,16 +474,6 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef) extends Actor with
}
}
/**
* Another node is joining when this node is uninitialized.
*/
def joiningUninitialized(node: UniqueAddress, roles: Set[String]): Unit = {
require(latestGossip.members.isEmpty, "Joining an uninitialized node can only be done from empty state")
joining(node, roles)
if (latestGossip.hasMember(selfUniqueAddress))
becomeInitialized()
}
/**
* Reply from Join request.
*/

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

@ -32,19 +32,21 @@ abstract class NodeUpSpec
import ClusterEvent._
"A cluster node that is joining another cluster" must {
"be moved to UP by the leader after a convergence" taggedAs LongRunningTest in {
"not be able to join a node that is not a cluster member" taggedAs LongRunningTest in {
// it should be possible to join an uninitialized node
// test race on purpose
runOn(first) {
cluster.join(second)
}
runOn(second) {
cluster.join(first)
enterBarrier("first-join-attempt")
Thread.sleep(2000)
clusterView.members must be(Set.empty)
enterBarrier("after-0")
}
awaitMembersUp(2)
"be moved to UP by the leader after a convergence" taggedAs LongRunningTest in {
awaitClusterUp(first, second)
enterBarrier("after-1")
}

12
akka-docs/rst/java/cluster-usage.rst
View file

@ -110,6 +110,8 @@ The seed nodes can be started in any order and it is not necessary to have all
seed nodes running, but the node configured as the first element in the ``seed-nodes``
configuration list must be started when initially starting a cluster, otherwise the
other seed-nodes will not become initialized and no other node can join the cluster.
The reason for the special first seed node is to avoid forming separated islands when
starting from an empty cluster.
It is quickest to start all configured seed nodes at the same time (order doesn't matter),
otherwise it can take up to the configured ``seed-node-timeout`` until the nodes
can join.
@ -122,7 +124,15 @@ If you don't configure the seed nodes you need to join manually, using :ref:`clu
or :ref:`cluster_command_line_java`. You can join to any node in the cluster. It doesn't
have to be configured as a seed node.
Joining can also be performed programatically with ``Cluster.get(system).join(address)``.
Joining can also be performed programatically with ``Cluster.get(system).join``. Note that
you can only join to an existing cluster member, which means that for bootstrapping some
node must join itself.
You may also use ``Cluster.get(system).joinSeedNodes``, which is attractive when dynamically
discovering other nodes at startup by using some external tool or API. When using
``joinSeedNodes`` you should not include the node itself except for the node that is
supposed to be the first seed node, and that should be placed first in parameter to
``joinSeedNodes``.
Unsuccessful join attempts are automatically retried after the time period defined in
configuration property ``retry-unsuccessful-join-after``. When using ``seed-nodes`` this

12
akka-docs/rst/scala/cluster-usage.rst
View file

@ -103,6 +103,8 @@ The seed nodes can be started in any order and it is not necessary to have all
seed nodes running, but the node configured as the first element in the ``seed-nodes``
configuration list must be started when initially starting a cluster, otherwise the
other seed-nodes will not become initialized and no other node can join the cluster.
The reason for the special first seed node is to avoid forming separated islands when
starting from an empty cluster.
It is quickest to start all configured seed nodes at the same time (order doesn't matter),
otherwise it can take up to the configured ``seed-node-timeout`` until the nodes
can join.
@ -115,7 +117,15 @@ If you don't configure the seed nodes you need to join manually, using :ref:`clu
or :ref:`cluster_command_line_scala`. You can join to any node in the cluster. It doesn't
have to be configured as a seed node.
Joining can also be performed programatically with ``Cluster(system).join(address)``.
Joining can also be performed programatically with ``Cluster(system).join``. Note that
you can only join to an existing cluster member, which means that for bootstrapping some
node must join itself.
You may also use ``Cluster(system).joinSeedNodes``, which is attractive when dynamically
discovering other nodes at startup by using some external tool or API. When using
``joinSeedNodes`` you should not include the node itself except for the node that is
supposed to be the first seed node, and that should be placed first in parameter to
``joinSeedNodes``.
Unsuccessful join attempts are automatically retried after the time period defined in
configuration property ``retry-unsuccessful-join-after``. When using ``seed-nodes`` this