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

Merge pull request #1606 from akka/wip-3478-failConstr-∂π

Browse source 
=act:3478 don’t fail constructor at end of hierarchy stress
This commit is contained in:
Roland Kuhn 2013-07-08 04:05:01 -07:00
commit c77d9cc18d
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
akka-actor-tests/src/test/scala/akka/actor/SupervisorHierarchySpec.scala
View file

@ -113,13 +113,14 @@ object SupervisorHierarchySpec {
*/
case class HierarchyState(log: Vector[Event], kids: Map[ActorPath, Int], failConstr: Failure)
val stateCache = new ConcurrentHashMap[ActorPath, HierarchyState]()
@volatile var ignoreFailConstr = false
class Hierarchy(size: Int, breadth: Int, listener: ActorRef, myLevel: Int) extends Actor {
var log = Vector.empty[Event]
stateCache.get(self.path) match {
case hs @ HierarchyState(l: Vector[Event], _, f: Failure) if f.failConstr > 0 ⇒
case hs @ HierarchyState(l: Vector[Event], _, f: Failure) if f.failConstr > 0 && !ignoreFailConstr ⇒
val log = l :+ Event("Failed in constructor", identityHashCode(this))
stateCache.put(self.path, hs.copy(log = log, failConstr = f.copy(failConstr = f.failConstr - 1)))
throw f
@ -467,7 +468,7 @@ object SupervisorHierarchySpec {
idleChildren = children
activeChildren = children
// set timeout for completion of the whole test (i.e. including Finishing and Stopping)
setTimer("phase", StateTimeout, 70.seconds.dilated, false)
setTimer("phase", StateTimeout, 90.seconds.dilated, false)
}
val workSchedule = 50.millis
@ -526,6 +527,10 @@ object SupervisorHierarchySpec {
goto(Failed)
}
onTransition {
case Stress -> Finishing ⇒ ignoreFailConstr = true
}
when(Finishing) {
case Event("pong", _) ⇒
pingChildren -= sender
@ -876,7 +881,7 @@ class SupervisorHierarchySpec extends AkkaSpec(SupervisorHierarchySpec.config) w
fsm ! Init
expectMsg(90 seconds, "stressTestSuccessful")
expectMsg(110 seconds, "stressTestSuccessful")
expectMsg("stressTestStopped")
}
}