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

Failure detector refactoring, see #2690

Browse source 
* Failure detector was previously copied with refactoring to
  akka-remote and this refactoring makes use of that and removes
  the failure detector in akka-cluster
* Adjustments to reference.conf
* Refactoring of FailureDetectorPuppet
This commit is contained in:
Patrik Nordwall 2013-01-29 11:55:33 +01:00
parent 6198480c34
commit 157a25bcde
16 changed files with 183 additions and 750 deletions
Download patch file Download diff file Expand all files Collapse all files

29
akka-cluster/src/multi-jvm/scala/akka/cluster/MultiNodeClusterSpec.scala
View file

@ -4,10 +4,8 @@
package akka.cluster
import language.implicitConversions
import org.scalatest.Suite
import org.scalatest.exceptions.TestFailedException
import com.typesafe.config.Config
import com.typesafe.config.ConfigFactory
import akka.remote.testconductor.RoleName
@ -19,6 +17,7 @@ import akka.event.Logging.ErrorLevel
import scala.concurrent.duration._
import scala.collection.immutable
import java.util.concurrent.ConcurrentHashMap
import akka.remote.DefaultFailureDetectorRegistry
object MultiNodeClusterSpec {
@ -258,20 +257,32 @@ trait MultiNodeClusterSpec extends Suite with STMultiNodeSpec { self: MultiNodeS
* [[akka.cluster.FailureDetectorPuppet]] is used as
* failure detector.
*/
def markNodeAsAvailable(address: Address): Unit = cluster.failureDetector match {
case puppet: FailureDetectorPuppet ⇒ puppet.markNodeAsAvailable(address)
case _ ⇒
}
def markNodeAsAvailable(address: Address): Unit =
failureDetectorPuppet(address) foreach (_.markNodeAsAvailable())
/**
* Marks a node as unavailable in the failure detector if
* [[akka.cluster.FailureDetectorPuppet]] is used as
* failure detector.
*/
def markNodeAsUnavailable(address: Address): Unit = cluster.failureDetector match {
case puppet: FailureDetectorPuppet ⇒ puppet.markNodeAsUnavailable(address)
case _ ⇒
def markNodeAsUnavailable(address: Address): Unit = {
if (isFailureDetectorPuppet) {
// before marking it as unavailble there must be at least one heartbeat
// to create the FailureDetectorPuppet in the FailureDetectorRegistry
cluster.failureDetector.heartbeat(address)
failureDetectorPuppet(address) foreach (_.markNodeAsUnavailable())
}
}
private def isFailureDetectorPuppet: Boolean =
cluster.settings.FailureDetectorImplementationClass == classOf[FailureDetectorPuppet].getName
private def failureDetectorPuppet(address: Address): Option[FailureDetectorPuppet] =
cluster.failureDetector match {
case reg: DefaultFailureDetectorRegistry[Address] ⇒
reg.failureDetector(address) collect { case p: FailureDetectorPuppet ⇒ p }
case _ ⇒ None
}
}