Added Owner to ControlPanel

Author: stidsborg

Core/Cleipnir.ResilientFunctions.Tests/InMemoryTests/RFunctionTests/SunshineTests.cs

@@ -91,4 +91,8 @@ public override Task ParamlessCanBeCreatedWithInitialFailedEffect()
     [TestMethod]
     public override Task FunctionCanAcceptAndReturnOptionType()
         => FunctionCanAcceptAndReturnOptionType(FunctionStoreFactory.Create());
+
+    [TestMethod]
+    public override Task ExecutingFunctionHasOwner()
+        => ExecutingFunctionHasOwner(FunctionStoreFactory.Create());
 }

Core/Cleipnir.ResilientFunctions.Tests/TestTemplates/FunctionTests/SunshineTests.cs

@@ -716,4 +716,40 @@ public async Task FunctionCanAcceptAndReturnOptionType(Task<IFunctionStore> stor
 
         unhandledExceptionHandler.ShouldNotHaveExceptions();
     }
+    
+    public abstract Task ExecutingFunctionHasOwner();
+    public async Task ExecutingFunctionHasOwner(Task<IFunctionStore> storeTask)
+    {
+        var store = await storeTask;
+        var flowId = TestFlowId.Create(); 
+
+        var unhandledExceptionHandler = new UnhandledExceptionCatcher();
+        using var functionsRegistry = new FunctionsRegistry(store, new Settings(unhandledExceptionHandler.Catch));
+        
+        var insideFlag = new SyncedFlag();
+        var completeFlag = new SyncedFlag();
+        var registration = functionsRegistry
+            .RegisterAction(
+                flowId.Type,
+                inner: async Task (string _) =>
+                {
+                    insideFlag.Raise();
+                    await completeFlag.WaitForRaised();
+                }
+            );
+        var flowTask = registration.Invoke(flowId.Instance, "param");
+        await insideFlag.WaitForRaised();
+
+        var cp = await registration.ControlPanel(flowId.Instance).ShouldNotBeNullAsync();
+        cp.Owner.ShouldNotBeNull();
+        cp.Owner.ShouldBe(functionsRegistry.ClusterInfo.ReplicaId);
+        
+        completeFlag.Raise();
+        await flowTask;
+
+        await cp.Refresh();
+        //todo cp.Owner.ShouldBeNull();
+        
+        unhandledExceptionHandler.ShouldNotHaveExceptions();
+    }
 }

Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/FunctionState.cs

@@ -6,6 +6,7 @@ public record FunctionState<TParam, TReturn>(
     Status Status,
     int Epoch,
     long Expires,
+    ReplicaId? Owner,
     TParam? Param, 
     TReturn? Result,
     FatalWorkflowException? FatalWorkflowException

Core/Cleipnir.ResilientFunctions/CoreRuntime/Invocation/InvocationHelper.cs

@@ -363,6 +363,7 @@ public async Task Interrupt(IReadOnlyList<StoredId> storedIds)
             sf.Status,
             sf.Epoch,
             sf.Expires,
+            sf.OwnerId,
             Param:
                 sf.Parameter == null 
                 ? default

Core/Cleipnir.ResilientFunctions/Domain/ClusterInfo.cs

@@ -14,7 +14,7 @@ public int Offset
             lock (_sync)
                 return _offset;
         }
-        set
+        internal set
         {
             lock (_sync)
                 _offset = value;
@@ -29,7 +29,7 @@ public int ReplicaCount
             lock (_sync)
                 return _replicaCount;
         }
-        set
+        internal set
         {
             lock (_sync)
                 _replicaCount = value;

Core/Cleipnir.ResilientFunctions/Domain/ControlPanel.cs

@@ -15,6 +15,7 @@ internal ControlPanel(
         Invoker<Unit, Unit> invoker, 
         InvocationHelper<Unit, Unit> invocationHelper, 
         FlowId flowId, StoredId storedId,
+        ReplicaId? owner,
         Status status, int epoch, long expires,  
         ExistingEffects effects,
         ExistingStates states, ExistingMessages messages, ExistingSemaphores semaphores, 
@@ -23,7 +24,7 @@ internal ControlPanel(
         UtcNow utcNow
     ) : base(
         invoker, invocationHelper, 
-        flowId, storedId, status, epoch, 
+        flowId, storedId, owner, status, epoch,
         expires, innerParam: Unit.Instance, innerResult: Unit.Instance, effects,
         states, messages, registeredTimeouts, semaphores, correlations, fatalWorkflowException,
         utcNow
@@ -58,6 +59,7 @@ internal ControlPanel(
         Invoker<TParam, Unit> invoker, 
         InvocationHelper<TParam, Unit> invocationHelper, 
         FlowId flowId, StoredId storedId,
+        ReplicaId? owner,
         Status status, int epoch, long expires, TParam innerParam, 
         ExistingEffects effects,
         ExistingStates states, ExistingMessages messages, ExistingSemaphores semaphores, 
@@ -66,7 +68,7 @@ internal ControlPanel(
         UtcNow utcNow
     ) : base(
         invoker, invocationHelper, 
-        flowId, storedId, status, epoch, 
+        flowId, storedId, owner, status, epoch,
         expires, innerParam, innerResult: Unit.Instance, effects,
         states, messages, registeredTimeouts, semaphores, correlations, fatalWorkflowException,
         utcNow
@@ -106,15 +108,15 @@ public class ControlPanel<TParam, TReturn> : BaseControlPanel<TParam, TReturn> w
     internal ControlPanel(
         Invoker<TParam, TReturn> invoker, 
         InvocationHelper<TParam, TReturn> invocationHelper, 
-        FlowId flowId, StoredId storedId, Status status, int epoch, 
+        FlowId flowId, StoredId storedId, ReplicaId? owner, Status status, int epoch, 
         long expires, TParam innerParam, 
         TReturn? innerResult, 
         ExistingEffects effects, ExistingStates states, ExistingMessages messages, ExistingSemaphores semaphores,
         ExistingRegisteredTimeouts registeredTimeouts, Correlations correlations, FatalWorkflowException? fatalWorkflowException,
         UtcNow utcNow
     ) : base(
         invoker, invocationHelper, 
-        flowId, storedId, status, epoch, expires, 
+        flowId, storedId, owner, status, epoch, expires, 
         innerParam, innerResult, effects, states, messages, 
         registeredTimeouts, semaphores, correlations, fatalWorkflowException,
         utcNow
@@ -161,6 +163,7 @@ internal BaseControlPanel(
         InvocationHelper<TParam, TReturn> invocationHelper,
         FlowId flowId, 
         StoredId storedId,
+        ReplicaId? owner,
         Status status, 
         int epoch,
         long expires,
@@ -179,6 +182,7 @@ internal BaseControlPanel(
         _invocationHelper = invocationHelper;
         FlowId = flowId;
         StoredId = storedId;
+        Owner = owner;
         Status = status;
         Epoch = epoch;
         LeaseExpiration = expires == long.MaxValue
@@ -200,6 +204,7 @@ internal BaseControlPanel(
 
     public FlowId FlowId { get; }
     public StoredId StoredId { get; }
+    public ReplicaId? Owner { get; }
     public Status Status { get; private set; }
     protected UtcNow UtcNow { get; }
 

Core/Cleipnir.ResilientFunctions/Domain/ControlPanelFactory.cs

@@ -37,6 +37,7 @@ internal ControlPanelFactory(FlowType flowType, StoredType storedType, Invoker<U
             _invocationHelper,
             flowId,
             storedId,
+            functionState.Owner,
             functionState.Status,
             functionState.Epoch,
             functionState.Expires,
@@ -84,6 +85,7 @@ internal ControlPanelFactory(FlowType flowType, StoredType storedType, Invoker<T
             _invocationHelper,
             flowId,
             storedId,
+            functionState.Owner,
             functionState.Status,
             functionState.Epoch,
             functionState.Expires,
@@ -121,8 +123,8 @@ internal ControlPanelFactory(FlowType flowType, StoredType storedType, Invoker<T
     {
         var flowId = new FlowId(_flowType, flowInstance);
         var storedId = new StoredId(_storedType, flowInstance.Value.ToStoredInstance());
-        var f = await _invocationHelper.GetFunction(storedId, flowId);
-        if (f == null)
+        var functionState = await _invocationHelper.GetFunction(storedId, flowId);
+        if (functionState == null)
             return null;
 
         var existingEffects = _invocationHelper.CreateExistingEffects(flowId);
@@ -131,18 +133,19 @@ internal ControlPanelFactory(FlowType flowType, StoredType storedType, Invoker<T
             _invocationHelper,
             flowId,
             storedId,
-            f.Status,
-            f.Epoch,
-            f.Expires,
-            f.Param!,
-            f.Result,
+            functionState.Owner,
+            functionState.Status,
+            functionState.Epoch,
+            functionState.Expires,
+            functionState.Param!,
+            functionState.Result,
             existingEffects,
             _invocationHelper.CreateExistingStates(flowId),
             _invocationHelper.CreateExistingMessages(flowId),
             _invocationHelper.CreateExistingSemaphores(flowId),
             _invocationHelper.CreateExistingTimeouts(flowId, existingEffects),
             _invocationHelper.CreateCorrelations(flowId),
-            f.FatalWorkflowException,
+            functionState.FatalWorkflowException,
             _utcNow
         );
     }

Core/Cleipnir.ResilientFunctions/FunctionsRegistry.cs

@@ -28,7 +28,7 @@ public class FunctionsRegistry : IDisposable
     private readonly LeasesUpdater _leasesUpdater;
     private readonly StoredTypes _storedTypes;
 
-    private readonly ClusterInfo _clusterInfo;
+    public ClusterInfo ClusterInfo { get; }
 
     private volatile bool _disposed;
     private readonly Lock _sync = new();
@@ -61,7 +61,7 @@ public FunctionsRegistry(IFunctionStore functionStore, Settings? settings = null
             utcNow
         );
 
-        _clusterInfo = new ClusterInfo(ReplicaId.NewId());
+        ClusterInfo = new ClusterInfo(ReplicaId.NewId());
     }
 
     #region Func overloads
@@ -225,7 +225,7 @@ public FuncRegistration<TParam, TReturn> RegisterFunc<TParam, TReturn>(
                 invocationHelper,
                 settingsWithDefaults.UnhandledExceptionHandler,
                 _functionStore.Utilities,
-                _clusterInfo.ReplicaId
+                ClusterInfo.ReplicaId
             );
 
             WatchDogsFactory.CreateAndStart(
@@ -322,7 +322,7 @@ private ParamlessRegistration RegisterParamless(
                 invocationHelper,
                 settingsWithDefaults.UnhandledExceptionHandler,
                 _functionStore.Utilities,
-                _clusterInfo.ReplicaId
+                ClusterInfo.ReplicaId
             );
 
             WatchDogsFactory.CreateAndStart(
@@ -419,7 +419,7 @@ public ActionRegistration<TParam> RegisterAction<TParam>(
                 invocationHelper,
                 settingsWithDefaults.UnhandledExceptionHandler,
                 _functionStore.Utilities,
-                _clusterInfo.ReplicaId
+                ClusterInfo.ReplicaId
             );
 
             WatchDogsFactory.CreateAndStart(

Stores/MariaDB/Cleipnir.ResilientFunctions.MariaDB.Tests/RFunctionTests/SunshineTests.cs

@@ -88,4 +88,8 @@ public override Task ParamlessCanBeCreatedWithInitialFailedEffect()
     [TestMethod]
     public override Task FunctionCanAcceptAndReturnOptionType()
         => FunctionCanAcceptAndReturnOptionType(FunctionStoreFactory.Create());
+    
+    [TestMethod]
+    public override Task ExecutingFunctionHasOwner()
+        => ExecutingFunctionHasOwner(FunctionStoreFactory.Create());
 }

Stores/PostgreSQL/Cleipnir.ResilientFunctions.PostgreSQL.Tests/RFunctionTests/SunshineTests.cs

@@ -89,4 +89,8 @@ public override Task ParamlessCanBeCreatedWithInitialFailedEffect()
     [TestMethod]
     public override Task FunctionCanAcceptAndReturnOptionType()
         => FunctionCanAcceptAndReturnOptionType(FunctionStoreFactory.Create());
+    
+    [TestMethod]
+    public override Task ExecutingFunctionHasOwner()
+        => ExecutingFunctionHasOwner(FunctionStoreFactory.Create());
 }