!clu #3920 Remove deprecated akka.cluster.auto-down
* replaced by akka.cluster.auto-down-unreachable-after
This commit is contained in:
parent
503c4ced8f
commit
b5be06e90c
5 changed files with 3 additions and 10 deletions
|
|
@ -29,9 +29,6 @@ akka {
|
||||||
# Disable with "off" or specify a duration to enable auto-down.
|
# Disable with "off" or specify a duration to enable auto-down.
|
||||||
auto-down-unreachable-after = off
|
auto-down-unreachable-after = off
|
||||||
|
|
||||||
# deprecated in 2.3, use 'auto-down-unreachable-after' instead
|
|
||||||
auto-down = off
|
|
||||||
|
|
||||||
# The roles of this member. List of strings, e.g. roles = ["A", "B"].
|
# The roles of this member. List of strings, e.g. roles = ["A", "B"].
|
||||||
# The roles are part of the membership information and can be used by
|
# The roles are part of the membership information and can be used by
|
||||||
# routers or other services to distribute work to certain member types,
|
# routers or other services to distribute work to certain member types,
|
||||||
|
|
|
||||||
|
|
@ -101,9 +101,6 @@ class Cluster(val system: ExtendedActorSystem) extends Extension {
|
||||||
|
|
||||||
logInfo("Starting up...")
|
logInfo("Starting up...")
|
||||||
|
|
||||||
if (settings.AutoDown)
|
|
||||||
log.warning("[akka.cluster.auto-down] setting is replaced by [akka.cluster.auto-down-unreachable-after]")
|
|
||||||
|
|
||||||
val failureDetector: FailureDetectorRegistry[Address] = {
|
val failureDetector: FailureDetectorRegistry[Address] = {
|
||||||
def createFailureDetector(): FailureDetector =
|
def createFailureDetector(): FailureDetector =
|
||||||
FailureDetectorLoader.load(settings.FailureDetectorImplementationClass, settings.FailureDetectorConfig, system)
|
FailureDetectorLoader.load(settings.FailureDetectorImplementationClass, settings.FailureDetectorConfig, system)
|
||||||
|
|
|
||||||
|
|
@ -218,7 +218,7 @@ private[cluster] class ClusterCoreDaemon(publisher: ActorRef) extends Actor with
|
||||||
|
|
||||||
val cluster = Cluster(context.system)
|
val cluster = Cluster(context.system)
|
||||||
import cluster.{ selfAddress, scheduler, failureDetector }
|
import cluster.{ selfAddress, scheduler, failureDetector }
|
||||||
import cluster.settings.{ AutoDown ⇒ _, _ }
|
import cluster.settings._
|
||||||
import cluster.InfoLogger._
|
import cluster.InfoLogger._
|
||||||
|
|
||||||
protected def selfUniqueAddress = cluster.selfUniqueAddress
|
protected def selfUniqueAddress = cluster.selfUniqueAddress
|
||||||
|
|
|
||||||
|
|
@ -58,12 +58,10 @@ final class ClusterSettings(val config: Config, val systemName: String) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@deprecated("akka.cluster.auto-down setting is replaced by akka.cluster.auto-down-unreachable-after", "2.3")
|
|
||||||
val AutoDown: Boolean = cc.getBoolean("auto-down")
|
|
||||||
val AutoDownUnreachableAfter: Duration = {
|
val AutoDownUnreachableAfter: Duration = {
|
||||||
val key = "auto-down-unreachable-after"
|
val key = "auto-down-unreachable-after"
|
||||||
cc.getString(key).toLowerCase match {
|
cc.getString(key).toLowerCase match {
|
||||||
case "off" ⇒ if (AutoDown) Duration.Zero else Duration.Undefined
|
case "off" ⇒ Duration.Undefined
|
||||||
case _ ⇒ cc.getMillisDuration(key) requiring (_ >= Duration.Zero, key + " >= 0s, or off")
|
case _ ⇒ cc.getMillisDuration(key) requiring (_ >= Duration.Zero, key + " >= 0s, or off")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -28,3 +28,4 @@ The following, previously deprecated, features have been removed:
|
||||||
* akka-transactor
|
* akka-transactor
|
||||||
* durable mailboxes (akka-mailboxes-common, akka-file-mailbox)
|
* durable mailboxes (akka-mailboxes-common, akka-file-mailbox)
|
||||||
* Cluster.publishCurrentClusterState
|
* Cluster.publishCurrentClusterState
|
||||||
|
* akka.cluster.auto-down, replaced by akka.cluster.auto-down-unreachable-after in Akka 2.3
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue