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

revert quarantine removed (leaving) cluster member, #21509

Browse source
This commit is contained in:
Patrik Nordwall 2016-09-21 17:27:34 +02:00
parent 7522a1db40
commit f1590a59b4
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
akka-cluster/src/main/scala/akka/cluster/ClusterRemoteWatcher.scala
View file

@ -52,7 +52,6 @@ private[cluster] class ClusterRemoteWatcher(
unreachableReaperInterval,
heartbeatExpectedResponseAfter) {
private val arteryEnabled = RARP(context.system).provider.remoteSettings.Artery.Enabled
val cluster = Cluster(context.system)
import cluster.selfAddress
@ -91,9 +90,9 @@ private[cluster] class ClusterRemoteWatcher(
def memberRemoved(m: Member, previousStatus: MemberStatus): Unit =
if (m.address != selfAddress) {
clusterNodes -= m.address
// TODO We should probably always quarantine when member is removed,
// but keeping old behavior for old remoting for now
if (arteryEnabled || previousStatus == MemberStatus.Down) {
// The reason we don't quarantine gracefully removed members (leaving) is that
// Cluster Singleton need to exchange TakeOver/HandOver messages.
if (previousStatus == MemberStatus.Down) {
quarantine(m.address, Some(m.uniqueAddress.uid), s"Cluster member removed, previous status [$previousStatus]")
}
publishAddressTerminated(m.address)