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

Merge pull request #1799 from akka/wip-3683-extra-heartbeat-patriknw

Browse source 
=clu #3683 Don't trigger extra heartbeat when not expected sender
This commit is contained in:
Patrik Nordwall 2013-10-25 07:16:22 -07:00
commit 0f7787a8c5
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -148,7 +148,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 = 5 s
# Cleanup of obsolete heartbeat requests
time-to-live = 60 s

6
akka-cluster/src/main/scala/akka/cluster/ClusterHeartbeat.scala
View file

@ -145,7 +145,9 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
}
def reset(snapshot: CurrentClusterState): Unit =
state = state.reset(snapshot.members.map(_.address)(collection.breakOut))
state = state.reset(snapshot.members.collect {
case m if m.status == MemberStatus.Up ⇒ m.address
}(collection.breakOut))
def addMember(m: Member): Unit = if (m.address != selfAddress) state = state addMember m.address
@ -178,7 +180,7 @@ private[cluster] final class ClusterHeartbeatSender extends Actor with ActorLogg
}
def triggerFirstHeartbeat(address: Address): Unit =
if (!cluster.failureDetector.isMonitoring(address)) {
if (!cluster.failureDetector.isMonitoring(address) && state.ring.mySenders.contains(address)) {
logInfo("Trigger extra expected heartbeat from [{}]", address)
cluster.failureDetector.heartbeat(address)
}

2
akka-cluster/src/test/scala/akka/cluster/ClusterConfigSpec.scala
View file

@ -33,7 +33,7 @@ class ClusterConfigSpec extends AkkaSpec {
HeartbeatInterval must be(1 second)
MonitoredByNrOfMembers must be(5)
HeartbeatRequestDelay must be(10 seconds)
HeartbeatExpectedResponseAfter must be(3 seconds)
HeartbeatExpectedResponseAfter must be(5 seconds)
HeartbeatRequestTimeToLive must be(1 minute)
LeaderActionsInterval must be(1 second)
UnreachableNodesReaperInterval must be(1 second)