Added optional ClusterIdentity parameter to IMemberStrategy.GetActivator (#2410)

* Added optional ClusterIdentity parameter to IMemberStrategy.GetActivator

* Refactor / cleanup / tag obsolete

Author: mhelleborg

src/Proto.Cluster/Identity/IdentityStorageWorker.cs

@@ -143,7 +143,7 @@ async Task<PidResult> Inner()
                     //are there any members that can spawn this kind?
                     //if not, just bail out
 
-                    var activator = _memberList.GetActivator(clusterIdentity.Kind, sender.Address);
+                    var activator = _memberList.GetActivator(clusterIdentity, sender.Address);
 
                     if (activator == null)
                     {

src/Proto.Cluster/Membership/MemberList.cs

@@ -137,8 +137,8 @@ public MemberList(Cluster cluster, bool isClient = false)
     internal Task<(bool consensus, ulong topologyHash)> TopologyConsensus(CancellationToken ct) =>
         _consensusManager.TopologyConsensus(ct);
 
-    internal Member? GetActivator(string kind, string requestSourceAddress) =>
-        _memberStrategyManager.GetActivator(kind, requestSourceAddress);
+    internal Member? GetActivator(ClusterIdentity identity, string requestSourceAddress) =>
+        _memberStrategyManager.GetActivator(identity, requestSourceAddress);
 
     /// <summary>
     ///     Used by clustering providers to update the member list.

src/Proto.Cluster/Membership/MemberStrategy.cs

@@ -4,6 +4,7 @@
 // </copyright>
 // -----------------------------------------------------------------------
 
+using System;
 using System.Collections.Immutable;
 using System.Linq;
 
@@ -37,8 +38,19 @@ public interface IMemberStrategy
     /// <summary>
     ///     Assigns a virtual actor to a member.
     /// </summary>
+    /// <param name="identity">Identity of the virtual actor to activate</param>
     /// <param name="senderAddress">Network address of the process that initiated the activation</param>
     /// <returns>Member to spawn on</returns>
+#pragma warning disable CS0618 // Type or member is obsolete
+    Member? GetActivator(ClusterIdentity identity, string senderAddress) => GetActivator(senderAddress);
+#pragma warning restore CS0618 // Type or member is obsolete
+
+    /// <summary>
+    ///     Assigns a virtual actor to a member.
+    /// </summary>
+    /// <param name="senderAddress">Network address of the process that initiated the activation</param>
+    /// <returns>Member to spawn on</returns>
+    [Obsolete("Use GetActivator(ClusterIdentity identity, string senderAddress) instead")]
     Member? GetActivator(string senderAddress);
 }
 

src/Proto.Cluster/Membership/MemberStrategyManager.cs

@@ -23,14 +23,14 @@ internal class MemberStrategyManager
 
     internal MemberStrategyManager(Cluster cluster) => _cluster = cluster;
 
-    internal Member? GetActivator(string kind, string requestSourceAddress)
+    internal Member? GetActivator(ClusterIdentity identity, string requestSourceAddress)
     {
-        if (_memberStrategyByKind.TryGetValue(kind, out var memberStrategy))
+        if (_memberStrategyByKind.TryGetValue(identity.Kind, out var memberStrategy))
         {
-            return memberStrategy.GetActivator(requestSourceAddress);
+            return memberStrategy.GetActivator(identity, requestSourceAddress);
         }
 
-        Logger.DidNotFindActivatorForKind(kind);
+        Logger.DidNotFindActivatorForKind(identity.Kind);
 
         return null;
     }

src/Proto.Cluster/Partition/PartitionIdentityActor.cs

@@ -580,7 +580,7 @@ private Task OnActivationRequest(ActivationRequest msg, IContext context)
         }
 
         //Get activator
-        var activatorAddress = _cluster.MemberList.GetActivator(msg.Kind, context.Sender!.Address)?.Address;
+        var activatorAddress = _cluster.MemberList.GetActivator(msg.ClusterIdentity, context.Sender!.Address)?.Address;
 
         if (string.IsNullOrEmpty(activatorAddress))
         {
@@ -687,7 +687,7 @@ TaskCompletionSource<ActivationResponse> setResponse
                             }
 
                             var currentActivatorAddress =
-                                _cluster.MemberList.GetActivator(msg.Kind, context.Sender!.Address)?.Address;
+                                _cluster.MemberList.GetActivator(msg.ClusterIdentity, context.Sender!.Address)?.Address;
 
                             if (_myAddress != currentActivatorAddress)
                             {