Remove increased leader-actions-interval, since it's false safety, see #2444

This commit is contained in:
Patrik Nordwall 2012-08-30 15:33:26 +02:00
parent 369d33da14
commit 8ba0041e7c
4 changed files with 2 additions and 7 deletions

View file

@ -25,7 +25,7 @@ object JoinInProgressMultiJvmSpec extends MultiNodeConfig {
threshold = 4 threshold = 4
acceptable-heartbeat-pause = 1 second acceptable-heartbeat-pause = 1 second
} }
}""") // increase the leader action task interval }""")
.withFallback(MultiNodeClusterSpec.clusterConfig))) .withFallback(MultiNodeClusterSpec.clusterConfig)))
} }

View file

@ -22,7 +22,6 @@ object MembershipChangeListenerExitingMultiJvmSpec extends MultiNodeConfig {
debugConfig(on = false) debugConfig(on = false)
.withFallback(ConfigFactory.parseString(""" .withFallback(ConfigFactory.parseString("""
akka.cluster { akka.cluster {
leader-actions-interval = 5 s # increase the leader action task interval
unreachable-nodes-reaper-interval = 300 s # turn "off" reaping to unreachable node set unreachable-nodes-reaper-interval = 300 s # turn "off" reaping to unreachable node set
} }
""") """)

View file

@ -17,10 +17,7 @@ object MembershipChangeListenerJoinMultiJvmSpec extends MultiNodeConfig {
val first = role("first") val first = role("first")
val second = role("second") val second = role("second")
commonConfig( commonConfig(debugConfig(on = false).withFallback(MultiNodeClusterSpec.clusterConfig))
debugConfig(on = false)
.withFallback(ConfigFactory.parseString("akka.clusterView.leader-actions-interval = 5 s") // increase the leader action task interval to allow time checking for JOIN before leader moves it to UP
.withFallback(MultiNodeClusterSpec.clusterConfig)))
} }
class MembershipChangeListenerJoinMultiJvmNode1 extends MembershipChangeListenerJoinSpec with FailureDetectorPuppetStrategy class MembershipChangeListenerJoinMultiJvmNode1 extends MembershipChangeListenerJoinSpec with FailureDetectorPuppetStrategy

View file

@ -21,7 +21,6 @@ object MembershipChangeListenerLeavingMultiJvmSpec extends MultiNodeConfig {
commonConfig( commonConfig(
debugConfig(on = false) debugConfig(on = false)
.withFallback(ConfigFactory.parseString(""" .withFallback(ConfigFactory.parseString("""
akka.clusterView.leader-actions-interval = 5 s
akka.cluster.unreachable-nodes-reaper-interval = 300 s # turn "off" akka.cluster.unreachable-nodes-reaper-interval = 300 s # turn "off"
""")) """))
.withFallback(MultiNodeClusterSpec.clusterConfig)) .withFallback(MultiNodeClusterSpec.clusterConfig))