From f72b1bea9f08ec14af84f1a6c20b16bd3ecb7bb3 Mon Sep 17 00:00:00 2001 From: Patrik Nordwall Date: Wed, 19 Aug 2015 07:34:24 +0200 Subject: [PATCH] =rem,clu #17750 Decrease default expected-response-after --- akka-cluster/src/main/resources/reference.conf | 4 ++-- .../src/test/scala/akka/cluster/ClusterConfigSpec.scala | 2 +- akka-remote/src/main/resources/reference.conf | 2 +- akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-cluster/src/main/resources/reference.conf b/akka-cluster/src/main/resources/reference.conf index 0316215cd3..43fa665b73 100644 --- a/akka-cluster/src/main/resources/reference.conf +++ b/akka-cluster/src/main/resources/reference.conf @@ -146,9 +146,9 @@ akka { monitored-by-nr-of-members = 5 # After the heartbeat request has been sent the first failure detection - # will start after this period, even though no heartbeat mesage has + # will start after this period, even though no heartbeat message has # been received. - expected-response-after = 5 s + expected-response-after = 1 s } diff --git a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala index 7b8f38ee51..fcc3e3a0d0 100644 --- a/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala @@ -34,7 +34,7 @@ class ClusterConfigSpec extends AkkaSpec { GossipTimeToLive should ===(2 seconds) HeartbeatInterval should ===(1 second) MonitoredByNrOfMembers should ===(5) - HeartbeatExpectedResponseAfter should ===(5 seconds) + HeartbeatExpectedResponseAfter should ===(1 seconds) LeaderActionsInterval should ===(1 second) UnreachableNodesReaperInterval should ===(1 second) PublishStatsInterval should ===(Duration.Undefined) diff --git a/akka-remote/src/main/resources/reference.conf b/akka-remote/src/main/resources/reference.conf index ea260af153..6cc243b41e 100644 --- a/akka-remote/src/main/resources/reference.conf +++ b/akka-remote/src/main/resources/reference.conf @@ -225,7 +225,7 @@ akka { # After the heartbeat request has been sent the first failure detection # will start after this period, even though no heartbeat mesage has # been received. - expected-response-after = 3 s + expected-response-after = 1 s } diff --git a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala index eb2b644d74..e0575a17df 100644 --- a/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/RemoteConfigSpec.scala @@ -53,7 +53,7 @@ class RemoteConfigSpec extends AkkaSpec( WatchFailureDetectorImplementationClass should ===(classOf[PhiAccrualFailureDetector].getName) WatchHeartBeatInterval should ===(1 seconds) - WatchHeartbeatExpectedResponseAfter should ===(3 seconds) + WatchHeartbeatExpectedResponseAfter should ===(1 seconds) WatchUnreachableReaperInterval should ===(1 second) WatchFailureDetectorConfig.getDouble("threshold") should ===(10.0 +- 0.0001) WatchFailureDetectorConfig.getInt("max-sample-size") should ===(200)