From 28746a4cfe73c223796fd4a45b1a2b42497e4940 Mon Sep 17 00:00:00 2001
From: Nicolas Vollmar <nvollmar@gmail.com>
Date: Wed, 27 Jun 2018 09:06:32 +0200
Subject: [PATCH] Ignore possible state change while waiting for removal #25274

---
 .../scala/akka/cluster/singleton/ClusterSingletonManager.scala | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
index 0658b02156..2e204a82ae 100644
--- a/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
+++ b/akka-cluster-tools/src/main/scala/akka/cluster/singleton/ClusterSingletonManager.scala
@@ -804,6 +804,9 @@ class ClusterSingletonManager(
     case Event(MemberRemoved(m, _), _) if m.uniqueAddress == cluster.selfUniqueAddress ⇒
       logInfo("Self removed, stopping ClusterSingletonManager")
       stop()
+    case Event(_: OldestChanged, _) ⇒
+      // not interested anymore - waiting for removal
+      stay
   }
 
   def selfMemberExited(): Unit = {