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

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

15
akka-cluster/src/multi-jvm/scala/akka/cluster/StressSpec.scala
View file

@ -27,6 +27,8 @@ import akka.cluster.ClusterEvent.CurrentClusterState
import akka.cluster.ClusterEvent.MemberEvent
import akka.cluster.StandardMetrics.Cpu
import akka.cluster.StandardMetrics.HeapMemory
import akka.remote.DefaultFailureDetectorRegistry
import akka.remote.PhiAccrualFailureDetector
import akka.remote.RemoteScope
import akka.remote.testkit.MultiNodeConfig
import akka.remote.testkit.MultiNodeSpec
@ -328,12 +330,19 @@ object StressMultiJvmSpec extends MultiNodeConfig {
*/
class PhiObserver extends Actor with ActorLogging {
val cluster = Cluster(context.system)
val fd = cluster.failureDetector.asInstanceOf[AccrualFailureDetector]
var reportTo: Option[ActorRef] = None
val emptyPhiByNode = Map.empty[Address, PhiValue].withDefault(address ⇒ PhiValue(address, 0, 0, 0.0))
var phiByNode = emptyPhiByNode
var nodes = Set.empty[Address]
def phi(address: Address): Double = cluster.failureDetector match {
case reg: DefaultFailureDetectorRegistry[Address] ⇒ reg.failureDetector(address) match {
case Some(fd: PhiAccrualFailureDetector) ⇒ fd.phi
case _ ⇒ 0.0
}
case _ ⇒ 0.0
}
import context.dispatcher
val checkPhiTask = context.system.scheduler.schedule(
1.second, 1.second, self, PhiTick)
@ -350,8 +359,8 @@ object StressMultiJvmSpec extends MultiNodeConfig {
case PhiTick ⇒
nodes foreach { node ⇒
val previous = phiByNode(node)
val φ = fd.phi(node)
if (φ > 0 || fd.isMonitoring(node)) {
val φ = phi(node)
if (φ > 0 || cluster.failureDetector.isMonitoring(node)) {
val aboveOne = if (!φ.isInfinite && φ > 1.0) 1 else 0
phiByNode += node -> PhiValue(node, previous.countAboveOne + aboveOne, previous.count + 1,
math.max(previous.max, φ))