cluster coordinated leave fix for empty cluster (#3516)

akkadotnet · Jun 19, 2018 · 98a740f · 98a740f
1 parent 762c2b8
commit 98a740f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/core/Akka.Cluster/ClusterDaemon.cs b/src/core/Akka.Cluster/ClusterDaemon.cs
@@ -1075,7 +1075,13 @@ private void AddCoordinatedLeave()
         {
             var sys = Context.System;
             var self = Self;
-            _coordShutdown.AddTask(CoordinatedShutdown.PhaseClusterExiting, "wait-exiting", () => _selfExiting.Task);
+            _coordShutdown.AddTask(CoordinatedShutdown.PhaseClusterExiting, "wait-exiting", () =>
+            {
+                if (_latestGossip.Members.IsEmpty)
+                    return Task.FromResult(Done.Instance); // not joined yet
+                else
+                    return _selfExiting.Task;
+            });
             _coordShutdown.AddTask(CoordinatedShutdown.PhaseClusterExitingDone, "exiting-completed", () =>
             {
                 if (Cluster.Get(sys).IsTerminated)

diff --git a/src/core/Akka.Cluster/CoordinatedShutdownLeave.cs b/src/core/Akka.Cluster/CoordinatedShutdownLeave.cs
@@ -13,7 +13,7 @@ namespace Akka.Cluster
 {
     /// <summary>
     /// INTERNAL API
-    /// 
+    ///
     /// Used for executing <see cref="CoordinatedShutdown"/> phases for graceful
     /// <see cref="Cluster.Leave"/> behaviors.
     /// </summary>
@@ -55,7 +55,13 @@ private void WaitingLeaveCompleted(IActorRef replyTo)
         {
             Receive<ClusterEvent.CurrentClusterState>(s =>
             {
-                if (s.Members.Any(m => m.UniqueAddress.Equals(_cluster.SelfUniqueAddress)
+                if (s.Members.IsEmpty)
+                {
+                    // not joined yet
+                    replyTo.Tell(Done.Instance);
+                    Context.Stop(Self);
+                }
+                else if (s.Members.Any(m => m.UniqueAddress.Equals(_cluster.SelfUniqueAddress)
                                        &&
                                        (m.Status == MemberStatus.Leaving || m.Status == MemberStatus.Exiting ||
                                         m.Status == MemberStatus.Down)))