Merge branch 'master' into wip-2112-leader-downing-spec-jboner

Conflicts:
	akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala

akka-cluster/src/multi-jvm/scala/akka/cluster/ClientDowningNodeThatIsUpSpec.scala

@@ -0,0 +1,77 @@
+/**
+ *  Copyright (C) 2009-2012 Typesafe Inc. <http://www.typesafe.com>
+ */
+package akka.cluster
+
+import com.typesafe.config.ConfigFactory
+import org.scalatest.BeforeAndAfter
+import akka.remote.testkit.MultiNodeConfig
+import akka.remote.testkit.MultiNodeSpec
+import akka.testkit._
+import akka.actor.Address
+
+object ClientDowningNodeThatIsUpMultiJvmSpec extends MultiNodeConfig {
+  val first = role("first")
+  val second = role("second")
+  val third = role("third")
+  val fourth = role("fourth")
+
+  commonConfig(debugConfig(on = false).
+    withFallback(ConfigFactory.parseString("akka.cluster.auto-down = off")).
+    withFallback(MultiNodeClusterSpec.clusterConfig))
+}
+
+class ClientDowningNodeThatIsUpMultiJvmNode1 extends ClientDowningNodeThatIsUpSpec
+class ClientDowningNodeThatIsUpMultiJvmNode2 extends ClientDowningNodeThatIsUpSpec
+class ClientDowningNodeThatIsUpMultiJvmNode3 extends ClientDowningNodeThatIsUpSpec
+class ClientDowningNodeThatIsUpMultiJvmNode4 extends ClientDowningNodeThatIsUpSpec
+
+class ClientDowningNodeThatIsUpSpec
+  extends MultiNodeSpec(ClientDowningNodeThatIsUpMultiJvmSpec)
+  with MultiNodeClusterSpec
+  with ImplicitSender with BeforeAndAfter {
+  import ClientDowningNodeThatIsUpMultiJvmSpec._
+
+  override def initialParticipants = 4
+
+  "Client of a 4 node cluster" must {
+
+    "be able to DOWN a node that is UP (healthy and available)" taggedAs LongRunningTest in {
+      runOn(first) {
+        cluster.self
+        awaitUpConvergence(numberOfMembers = 4)
+
+        val thirdAddress = node(third).address
+        testConductor.enter("all-up")
+
+        // mark 'third' node as DOWN
+        testConductor.removeNode(third)
+        cluster.down(thirdAddress)
+        testConductor.enter("down-third-node")
+
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Seq(thirdAddress))
+        cluster.latestGossip.members.exists(_.address == thirdAddress) must be(false)
+        testConductor.enter("await-completion")
+      }
+
+      runOn(third) {
+        cluster.join(node(first).address)
+        awaitUpConvergence(numberOfMembers = 4)
+        testConductor.enter("all-up")
+      }
+
+      runOn(second, fourth) {
+        cluster.join(node(first).address)
+        awaitUpConvergence(numberOfMembers = 4)
+
+        val thirdAddress = node(third).address
+        testConductor.enter("all-up")
+
+        testConductor.enter("down-third-node")
+
+        awaitUpConvergence(numberOfMembers = 3, canNotBePartOfMemberRing = Seq(thirdAddress))
+        testConductor.enter("await-completion")
+      }
+    }
+  }
+}