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

Merge pull request #21513 from akka/wip-21512-quick-restart-patriknw

Browse source 
fix problem with quick restart, #21512
This commit is contained in:
Patrik Nordwall 2016-09-22 18:33:22 +02:00 • committed by GitHub
commit 63917c1947
9 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-cluster/src/multi-jvm/scala/akka/cluster/SharedMediaDriverSupport.scala
View file

@ -35,7 +35,7 @@ object SharedMediaDriverSupport {
val driverContext = new MediaDriver.Context
driverContext.aeronDirectoryName(aeronDir)
driverContext.clientLivenessTimeoutNs(arterySettings.Advanced.ClientLivenessTimeout.toNanos)
driverContext.imageLivenessTimeoutNs(arterySettings.Advanced.ImageLivenessTimeoutNs.toNanos)
driverContext.imageLivenessTimeoutNs(arterySettings.Advanced.ImageLivenessTimeout.toNanos)
driverContext.driverTimeoutMs(arterySettings.Advanced.DriverTimeout.toMillis)
val idleCpuLevel = arterySettings.Advanced.IdleCpuLevel

6
akka-remote/src/main/resources/reference.conf
View file

@ -227,7 +227,8 @@ akka {
system-message-resend-interval = 1 second
# The timeout for outbound associations to perform the handshake.
handshake-timeout = 15 s
# This timeout must be greater than the 'image-liveness-timeout'.
handshake-timeout = 20 s
# incomplete handshake attempt is retried with this interval
handshake-retry-interval = 1 second
@ -274,7 +275,8 @@ akka {
# Timeout for each the INACTIVE and LINGER stages an aeron image
# will be retained for when it is no longer referenced.
image-liveness-timeout = 20 seconds
# This timeout must be less than the 'handshake-timeout'.
image-liveness-timeout = 10 seconds
# Timeout after which the aeron driver is considered dead
# if it does not update its C'n'C timestamp.

3
akka-remote/src/main/scala/akka/remote/artery/ArterySettings.scala
View file

@ -103,8 +103,9 @@ private[akka] final class ArterySettings private (config: Config) {
interval > Duration.Zero, "stop-quarantined-after-idle must be more than zero")
val ClientLivenessTimeout = config.getMillisDuration("client-liveness-timeout").requiring(interval ⇒
interval > Duration.Zero, "client-liveness-timeout must be more than zero")
val ImageLivenessTimeoutNs = config.getMillisDuration("image-liveness-timeout").requiring(interval ⇒
val ImageLivenessTimeout = config.getMillisDuration("image-liveness-timeout").requiring(interval ⇒
interval > Duration.Zero, "image-liveness-timeout must be more than zero")
require(ImageLivenessTimeout < HandshakeTimeout, "image-liveness-timeout must be less than handshake-timeout")
val DriverTimeout = config.getMillisDuration("driver-timeout").requiring(interval ⇒
interval > Duration.Zero, "driver-timeout must be more than zero")
val FlightRecorderEnabled: Boolean = getBoolean("flight-recorder.enabled")

2
akka-remote/src/main/scala/akka/remote/artery/ArteryTransport.scala
View file

@ -444,7 +444,7 @@ private[remote] class ArteryTransport(_system: ExtendedActorSystem, _provider: R
driverContext.aeronDirectoryName(randomName)
}
driverContext.clientLivenessTimeoutNs(settings.Advanced.ClientLivenessTimeout.toNanos)
driverContext.imageLivenessTimeoutNs(settings.Advanced.ImageLivenessTimeoutNs.toNanos)
driverContext.imageLivenessTimeoutNs(settings.Advanced.ImageLivenessTimeout.toNanos)
driverContext.driverTimeoutMs(settings.Advanced.DriverTimeout.toMillis)
val idleCpuLevel = settings.Advanced.IdleCpuLevel

1
akka-remote/src/test/scala/akka/remote/artery/HandshakeDenySpec.scala
View file

@ -20,6 +20,7 @@ object HandshakeDenySpec {
remote.artery.canonical.hostname = localhost
remote.artery.canonical.port = 0
remote.artery.advanced.handshake-timeout = 2s
remote.artery.advanced.image-liveness-timeout = 1.9s
}
""")

1
akka-remote/src/test/scala/akka/remote/artery/HandshakeFailureSpec.scala
View file

@ -24,6 +24,7 @@ object HandshakeFailureSpec {
remote.artery.canonical.hostname = localhost
remote.artery.canonical.port = 0
remote.artery.advanced.handshake-timeout = 2s
remote.artery.advanced.image-liveness-timeout = 1.9s
}
""")

1
akka-remote/src/test/scala/akka/remote/artery/HandshakeRetrySpec.scala
View file

@ -23,6 +23,7 @@ object HandshakeRetrySpec {
remote.artery.canonical.hostname = localhost
remote.artery.canonical.port = 0
remote.artery.advanced.handshake-timeout = 10s
remote.artery.advanced.image-liveness-timeout = 7s
}
""")

1
akka-remote/src/test/scala/akka/remote/artery/LateConnectSpec.scala
View file

@ -24,6 +24,7 @@ object LateConnectSpec {
remote.artery.canonical.hostname = localhost
remote.artery.canonical.port = 0
remote.artery.advanced.handshake-timeout = 3s
remote.artery.advanced.image-liveness-timeout = 2.9s
}
""")

1
akka-remote/src/test/scala/akka/remote/artery/compress/HandshakeShouldDropCompressionTableSpec.scala
View file

@ -31,6 +31,7 @@ object HandshakeShouldDropCompressionTableSpec {
remote.artery.canonical.hostname = localhost
remote.artery.canonical.port = 0
remote.artery.advanced.handshake-timeout = 10s
remote.artery.advanced.image-liveness-timeout = 7s
remote.artery.advanced.compression {
actor-refs {