From 6621cda53666faecb48a4fa68c7c856293d6a6dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= Date: Mon, 11 Feb 2013 13:06:33 +0100 Subject: [PATCH] Scheduler shutdown timeout needs to be longer on slow machines. See #3027 --- .../src/test/scala/akka/actor/SchedulerSpec.scala | 2 ++ akka-actor/src/main/scala/akka/actor/Scheduler.scala | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala index ee198641a7..5996d9ed47 100644 --- a/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/actor/SchedulerSpec.scala @@ -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 diff --git a/akka-actor/src/main/scala/akka/actor/Scheduler.scala b/akka-actor/src/main/scala/akka/actor/Scheduler.scala index b8f340d4b8..12c66b34b0 100644 --- a/akka-actor/src/main/scala/akka/actor/Scheduler.scala +++ b/akka-actor/src/main/scala/akka/actor/Scheduler.scala @@ -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