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

Merge pull request #25565 from johanandren/wip-down-removal-margin-take-two-johanandren

Browse source 
Undeprecate the config, add a note in cluster singleton
This commit is contained in:
Johan Andrén 2018-09-20 09:03:34 +02:00 • committed by GitHub
commit 4206e16954
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
View file

@ -44,6 +44,8 @@ object ClusterSingletonManagerSettings {
*/ */
def apply(system: ActorSystem): ClusterSingletonManagerSettings = def apply(system: ActorSystem): ClusterSingletonManagerSettings =
apply(system.settings.config.getConfig("akka.cluster.singleton")) apply(system.settings.config.getConfig("akka.cluster.singleton"))
// note that this setting has some additional logic inside the ClusterSingletonManager
// falling back to DowningProvider.downRemovalMargin if it is off/Zero
.withRemovalMargin(Cluster(system).settings.DownRemovalMargin) .withRemovalMargin(Cluster(system).settings.DownRemovalMargin)
/** /**

4
akka-cluster/src/main/resources/reference.conf
View file

@ -47,10 +47,6 @@ akka {
# If a downing-provider-class is configured this setting is ignored. # If a downing-provider-class is configured this setting is ignored.
auto-down-unreachable-after = off auto-down-unreachable-after = off
# DEPRECATED: Specific to akka.cluster.AutoDown (which is discouraged to be used in production)
# should not be used anywhere else, instead Cluster.downingProvider.downRemovalMargin
# should be used as it allows the downing provider to decide removal margins.
#
# Time margin after which shards or singletons that belonged to a downed/removed # Time margin after which shards or singletons that belonged to a downed/removed
# partition are created in surviving partition. The purpose of this margin is that # partition are created in surviving partition. The purpose of this margin is that
# in case of a network partition the persistent actors in the non-surviving partitions # in case of a network partition the persistent actors in the non-surviving partitions