Skip to content
This repository was archived by the owner on Nov 8, 2020. It is now read-only.

Commit 955b81d

Browse files
u-lessu-less
committed
Fix reset method.
1 parent 77ba4c8 commit 955b81d

12 files changed

Lines changed: 18 additions & 17 deletions

File tree

‎Test/RayCore.Tests/RayCore.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
3+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
44
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
55
<PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.0.2" />
66
<PackageReference Include="xunit" Version="2.4.1" />

‎examples/Transfer/Transfer.Client/Transfer.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<ProjectReference Include="..\Transfer.IGrains\Transfer.IGrains.csproj" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
1313
</ItemGroup>
1414
</Project>

‎examples/Transfer/Transfer.Server/Transfer.Server.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
9-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
8+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
9+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
1010
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.0.2" />
1111
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.0.2" />
1212
<PackageReference Include="OrleansDashboard" Version="3.0.8" />

‎examples/TxTransfer/Transfer.Client/Transfer.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
<ProjectReference Include="..\Transfer.IGrains\Transfer.IGrains.csproj" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
1313
</ItemGroup>
1414
</Project>

‎examples/TxTransfer/Transfer.Server/Transfer.Server.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Confluent.Kafka" Version="1.3.0" />
9-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.0" />
10-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.0" />
9+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.1" />
10+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.1" />
1111
<PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.0.2" />
1212
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.0.2" />
1313
<PackageReference Include="OrleansDashboard" Version="3.0.8" />

‎src/Ray.Core/Core/Grains/ObserverGrain.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,8 @@ protected virtual async ValueTask SaveSnapshotAsync(bool force = false)
670670
public virtual async Task Reset()
671671
{
672672
await ObserverSnapshotStorage.Delete(GrainId);
673-
UnprocessedEventList.Clear();
673+
if (ConcurrentHandle)
674+
UnprocessedEventList.Clear();
674675
await ReadSnapshotAsync();
675676
}
676677
}

‎src/Ray.Core/Core/Grains/RayGrain.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ protected async ValueTask DeleteSnapshot()
445445
protected async Task Reset()
446446
{
447447
await Over(OverType.DeleteAll);
448-
await ReadSnapshotAsync();
448+
await RecoverySnapshot();
449449
await ObserverUnit.Reset(Snapshot.Base.StateId);
450450
}
451451
protected virtual async Task<bool> RaiseEvent(IEvent @event, EventUID eUID = null)

‎src/Ray.Core/Ray.Core.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
4-
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.0" />
3+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
4+
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.1" />
55
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.0.2">
66
<PrivateAssets>all</PrivateAssets>
77
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

‎src/Ray.EventBus.Kafka/Ray.EventBus.Kafka.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<PackageReference Include="Confluent.Kafka" Version="1.3.0" />
4-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.0" />
4+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.1" />
55
</ItemGroup>
66

77
<ItemGroup>

‎src/Ray.EventBus.RabbitMQ/Ray.EventBus.RabbitMQ.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
3-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.0" />
4-
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.0" />
3+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
4+
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.1" />
55
<PackageReference Include="RabbitMQ.Client" Version="6.0.0-pre6" />
66
</ItemGroup>
77

0 commit comments

Comments
 (0)