🚀 feat(Actor): 优化激活和停用方法，新增取消令牌参数以支持异步操作

Author: feijie999

Packages.props

@@ -15,6 +15,7 @@
 
     <PackageReference Update="Microsoft.Orleans.OrleansProviders" Version="8.2.0"/>
     <PackageReference Update="Microsoft.Orleans.Core" Version="8.2.0" />
+    <PackageReference Update="Microsoft.Orleans.Sdk" Version="8.2.0" />
     <PackageReference Update="Microsoft.Orleans.Core.Abstractions" Version="8.2.0" />
     <PackageReference Update="Microsoft.Orleans.Runtime.Abstractions" Version="8.2.0" />
     <PackageReference Update="Microsoft.Orleans.OrleansRuntime" Version="8.2.0" />
@@ -28,7 +29,7 @@
     <PackageReference Update="RabbitMQ.Client" Version="6.8.1" />
     <PackageReference Update="System.Reactive" Version="6.0.1" />
     <PackageReference Update="linq2db" Version="4.1.1" />
-    <PackageReference Update="IdGen" Version="3.0.1" />
+    <PackageReference Update="IdGen" Version="3.0.7" />
 
     <PackageReference Update="Lindhart.Analyser.MissingAwaitWarning" Version="2.0.0" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="All" />

src/Vertex.Runtime/Actor/ActorBase.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using Orleans;
 using Vertex.Abstractions.Actor;
@@ -18,12 +19,17 @@ public ActorBase()
         /// </summary>
         public TPrimaryKey ActorId { get; private set; }
 
+        public Task OnActivateAsync()
+        {
+            return this.OnActivateAsync(CancellationToken.None);
+        }
+
         /// <summary>
         /// Gets the real Type of the current Grain.
         /// </summary>
         protected Type ActorType { get; }
 
-        public override Task OnActivateAsync()
+        public override Task OnActivateAsync(CancellationToken cancellationToken)
         {
             var type = typeof(TPrimaryKey);
             if (type == typeof(long) && this.GetPrimaryKeyLong() is TPrimaryKey longKey)
@@ -43,7 +49,7 @@ public override Task OnActivateAsync()
                 throw new ArgumentOutOfRangeException(typeof(TPrimaryKey).FullName);
             }
 
-            return base.OnActivateAsync();
+            return base.OnActivateAsync(cancellationToken);
         }
     }
 }

src/Vertex.Runtime/Actor/FlowActor.cs

@@ -7,11 +7,13 @@
 using System.Reflection;
 using System.Reflection.Emit;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Caching.Distributed;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Orleans;
 using Orleans.Concurrency;
 using Orleans.Runtime;
 using Vertex.Abstractions.Actor;
@@ -364,10 +366,10 @@ protected virtual async ValueTask DependencyInjection()
             var snapshotStorageFactory = this.ServiceProvider.GetService<ISubSnapshotStorageFactory>();
             this.SnapshotStorage = await snapshotStorageFactory.Create(this);
         }
-
-        public override async Task OnActivateAsync()
+        
+        public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
-            await base.OnActivateAsync();
+            await base.OnActivateAsync(cancellationToken);
             await this.DependencyInjection();
 
             if (this.ConcurrentHandle)
@@ -395,13 +397,14 @@ public override async Task OnActivateAsync()
             }
         }
 
-        public override async Task OnDeactivateAsync()
+        public override async Task OnDeactivateAsync(DeactivationReason reason, CancellationToken cancellationToken)
         {
             await this.SaveSnapshotAsync(isDeactivate: true);
 
             if (this.Logger.IsEnabled(LogLevel.Trace))
             {
                 this.Logger.LogTrace("Deactivate completed: {0}->{1}", this.ActorType.Name, this.Serializer.Serialize(this.Snapshot));
+                this.Logger.LogTrace("Deactivate reason: {0}->{1}", this.ActorType.Name, reason.Description);
             }
         }
 

src/Vertex.Runtime/Actor/ShadowActor.cs

@@ -3,6 +3,7 @@
 using System.Data;
 using System.Linq;
 using System.Runtime.CompilerServices;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -65,9 +66,9 @@ protected virtual async ValueTask DependencyInjection()
             this.SnapshotStorage = await snapshotStorageFactory.Create(this);
         }
 
-        public override async Task OnActivateAsync()
+        public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
-            await base.OnActivateAsync();
+            await base.OnActivateAsync(cancellationToken);
             await this.DependencyInjection();
 
             try

src/Vertex.Runtime/Actor/VertexActor.cs

@@ -5,10 +5,12 @@
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using Orleans;
 using Orleans.Runtime;
 using Vertex.Abstractions.Actor;
 using Vertex.Abstractions.Event;
@@ -103,9 +105,9 @@ protected virtual async ValueTask DependencyInjection()
         /// The method used to initialize is called when Grain is activated (overriding in subclasses is prohibited)
         /// </summary>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public override async Task OnActivateAsync()
+        public override async Task OnActivateAsync(CancellationToken cancellationToken)
         {
-            await base.OnActivateAsync();
+            await base.OnActivateAsync(cancellationToken);
             await this.DependencyInjection();
 
             // Load snapshot
@@ -250,7 +252,7 @@ protected virtual ValueTask CreateSnapshot()
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         protected virtual ValueTask OnStartSaveSnapshot() => ValueTask.CompletedTask;
 
-        public override async Task OnDeactivateAsync()
+        public override async Task OnDeactivateAsync(DeactivationReason reason, CancellationToken cancellationToken)
         {
             try
             {
@@ -263,6 +265,7 @@ public override async Task OnDeactivateAsync()
                 if (this.Logger.IsEnabled(LogLevel.Trace))
                 {
                     this.Logger.LogTrace("Deactivate completed: {0}->{1}", this.ActorType.FullName, this.Serializer.Serialize(this.Snapshot));
+                    this.Logger.LogTrace("Deactivate reason: {0}->{1}", this.ActorType.Name, reason.Description);
                 }
             }
             catch (Exception ex)

src/Vertex.Runtime/Vertex.Runtime.csproj

@@ -4,8 +4,7 @@
     <PackageReference Include="IdGen" />
     <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" />
-    <PackageReference Include="Microsoft.Orleans.Core" />
+    <PackageReference Include="Microsoft.Orleans.Sdk" />
   </ItemGroup>
 
   <ItemGroup>