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

Treat MemberStatus.Removed as terminal state in ClusterReadView (#25499)

Browse source 
* Fixes #25489 where cluster event for a previous state can override
the call to cluster.close settings it to remove
* Fix case where Removed is used as a placeholder for unknown
This commit is contained in:
Christopher Batey 2018-10-03 13:01:38 +01:00 • committed by Johan Andrén
parent 1d65159923
commit ba67f71ca8
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-cluster/src/main/scala/akka/cluster/ClusterReadView.scala
View file

@ -35,6 +35,9 @@ private[akka] class ClusterReadView(cluster: Cluster) extends Closeable {
@volatile @volatile
private var _cachedSelf: OptionVal[Member] = OptionVal.None private var _cachedSelf: OptionVal[Member] = OptionVal.None
@volatile
private var _closed: Boolean = false
/** /**
* Current internal cluster stats, updated periodically via event bus. * Current internal cluster stats, updated periodically via event bus.
*/ */
@ -87,7 +90,12 @@ private[akka] class ClusterReadView(cluster: Cluster) extends Closeable {
e match { e match {
case e: MemberEvent if e.member.address == selfAddress ⇒ case e: MemberEvent if e.member.address == selfAddress ⇒
_cachedSelf match {
case OptionVal.Some(s) if s.status == MemberStatus.Removed && _closed ⇒
// ignore as Cluster.close has been called
case _ ⇒
_cachedSelf = OptionVal.Some(e.member) _cachedSelf = OptionVal.Some(e.member)
}
case _ ⇒ case _ ⇒
} }
case s: CurrentClusterState ⇒ _state = s case s: CurrentClusterState ⇒ _state = s
@ -186,6 +194,7 @@ private[akka] class ClusterReadView(cluster: Cluster) extends Closeable {
* Unsubscribe to cluster events. * Unsubscribe to cluster events.
*/ */
def close(): Unit = { def close(): Unit = {
_closed = true
_cachedSelf = OptionVal.Some(self.copy(MemberStatus.Removed)) _cachedSelf = OptionVal.Some(self.copy(MemberStatus.Removed))
if (!eventBusListener.isTerminated) if (!eventBusListener.isTerminated)
eventBusListener ! PoisonPill eventBusListener ! PoisonPill