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

Scheduler shutdown timeout needs to be longer on slow machines. See #3027

Browse source
This commit is contained in:
Björn Antonsson 2013-02-11 13:06:33 +01:00
parent 814ba1c02a
commit 6621cda536
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala
View file

@ -485,6 +485,8 @@ class LightArrayRevolverSchedulerSpec extends AkkaSpec(SchedulerSpec.testConfRev
// println(s"clock=$time")
time
}
override protected def getShutdownTimeout: FiniteDuration = super.getShutdownTimeout.dilated
override protected def waitNanos(ns: Long): Unit = {
// println(s"waiting $ns")
prb.ref ! ns

7
akka-actor/src/main/scala/akka/actor/Scheduler.scala
View file

@ -212,6 +212,11 @@ class LightArrayRevolverScheduler(config: Config,
*/
protected def clock(): Long = System.nanoTime
/**
* Overridable for tests
*/
protected def getShutdownTimeout: FiniteDuration = ShutdownTimeout
/**
* Overridable for tests
*/
@ -276,7 +281,7 @@ class LightArrayRevolverScheduler(config: Config,
}
}
override def close(): Unit = Await.result(stop(), ShutdownTimeout) foreach execDirectly
override def close(): Unit = Await.result(stop(), getShutdownTimeout) foreach execDirectly
override val maxFrequency: Double = 1.second / TickDuration