From 0413b44c983f8f533aa5238fd3be6d528122afdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Wed, 8 Feb 2012 14:14:01 +0100 Subject: [PATCH] Completed singleton and N-node cluster boot up and joining phase. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Simplified node join phase. * Added tests for cluster node startup and joining, both for singleton cluster and 2-node cluster. * Fixed bug in cluster node address and cluster daemon lookup. * Changed some APIs. * Renamed 'contact-point' to 'node-to-join'. * Minor refactorings. Signed-off-by: Jonas BoneĢr --- akka-cluster/src/main/resources/reference.conf | 10 ---------- .../test/scala/akka/cluster/ClusterConfigSpec.scala | 6 +----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf index ee2f2b23e8..3df6dd3774 100644 --- a/akka-cluster/src/main/resources/reference.conf +++ b/akka-cluster/src/main/resources/reference.conf @@ -8,19 +8,9 @@ akka { cluster { -<<<<<<< HEAD # node to join - the full URI defined by a string on the form of "akka://system@hostname:port" # leave as empty string if the node should be a singleton cluster node-to-join = "" -======= - join { - # contact point on the form of "hostname:port" of a node to try to join - # leave as empty string if the node should be a singleton cluster - contact-point = "" - timeout = 30s - max-time-to-retry = 30s - } ->>>>>>> Removed cluster seed nodes, added 'join.contact-point', changed joining phase, added singleton cluster mode plus misc other changes. gossip { initialDelay = 5s diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala index 7f1b26e553..78c836f0b5 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala @@ -25,11 +25,7 @@ class ClusterConfigSpec extends AkkaSpec( import settings._ FailureDetectorThreshold must be(8) FailureDetectorMaxSampleSize must be(1000) - - JoinContactPoint must be(None) - JoinTimeout must be(30 seconds) - JoinMaxTimeToRetry must be(30 seconds) - + NodeToJoin must be(None) GossipInitialDelay must be(5 seconds) GossipFrequency must be(1 second) }