Merge branch 'dev' into 6927-Akka.Persistence.Query

akkadotnet · Oct 29, 2023 · 6987f02 · 6987f02
2 parents 30cf459 + f2867df
commit 6987f02
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 10 deletions.
diff --git a/docs/articles/actors/receive-actor-api.md b/docs/articles/actors/receive-actor-api.md
@@ -403,6 +403,9 @@ Task.WhenAll(tasks).PipeTo(actorC, Self);
 
 This example demonstrates `Ask` together with the `Pipe` Pattern on tasks, because this is likely to be a common combination. Please note that all of the above is completely non-blocking and asynchronous: `Ask` produces a `Task`, two of which are awaited until both are completed, and when that happens, a new `Result` object is forwarded to another actor.
 
+> [!NOTE]
+> While `Ask` waits for a response, that does not ensure it receives any kind of priority. Messages sent via `Ask` queue in actor mailboxes the same way that messages sent via `Tell` do. You may need to adapt your actor hierarchy if `Ask` messages might be impeded by a large queue in an actor's mailbox.
+
 Using `Ask` will send a message to the receiving Actor as with `Tell`, and the receiving actor must reply with `Sender.Tell(reply, Self)` in order to complete the returned `Task` with a value. The `Ask` operation involves creating an internal actor for handling this reply, which needs to have a timeout after which it is destroyed in order not to leak resources; see more below.
 
 > [!WARNING]

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
     <Authors>Akka.NET Team</Authors>
-    <VersionPrefix>1.5.7</VersionPrefix>
+    <VersionPrefix>1.5.14</VersionPrefix>
     <PackageIcon>akkalogo.png</PackageIcon>
     <PackageProjectUrl>https://github.com/akkadotnet/akka.net</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/akkadotnet/akka.net/blob/master/LICENSE</PackageLicenseUrl>
@@ -24,7 +24,7 @@
     <HyperionVersion>0.12.2</HyperionVersion>
     <NewtonsoftJsonVersion>[13.0.1,)</NewtonsoftJsonVersion>
     <NBenchVersion>2.0.1</NBenchVersion>
-    <ProtobufVersion>3.24.3</ProtobufVersion>
+    <ProtobufVersion>3.24.4</ProtobufVersion>
     <BenchmarkDotNetVersion>0.13.9</BenchmarkDotNetVersion>
     <NetTestVersion>net7.0</NetTestVersion>
     <FsharpVersion>6.0.5</FsharpVersion>
@@ -67,4 +67,4 @@
     <Message Text="@(none)">
     </Message>
   </Target>
-</Project>
+</Project>
diff --git a/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj b/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-    <PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.8" />
+    <PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.9" />
     <!-- FluentAssertions is used in some benchmarks to validate internal behaviors -->
     <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
   </ItemGroup>

diff --git a/src/benchmark/Akka.Cluster.Benchmarks/Akka.Cluster.Benchmarks.csproj b/src/benchmark/Akka.Cluster.Benchmarks/Akka.Cluster.Benchmarks.csproj
@@ -6,7 +6,7 @@
 
     <ItemGroup>
         <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-        <PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.8" />
+        <PackageReference Include="BenchmarkDotNet.Diagnostics.dotTrace" Version="0.13.9" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ClusterSharding.cs
@@ -1415,10 +1415,13 @@ public IShardAllocationStrategy DefaultShardAllocationStrategy(ClusterShardingSe
             }
             else
             {
+                // TODO: remove this in v1.6 and force all users to use only the new strategy going forward
                 // old algorithm
                 var threshold = settings.TuningParameters.LeastShardAllocationRebalanceThreshold;
                 var maxSimultaneousRebalance = settings.TuningParameters.LeastShardAllocationMaxSimultaneousRebalance;
+#pragma warning disable CS0618 // Type or member is obsolete
                 return new LeastShardAllocationStrategy(threshold, maxSimultaneousRebalance);
+#pragma warning restore CS0618 // Type or member is obsolete
             }
         }
     }

diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/ShardAllocationStrategy.cs b/src/contrib/cluster/Akka.Cluster.Sharding/ShardAllocationStrategy.cs
@@ -139,6 +139,7 @@ public static IShardAllocationStrategy LeastShardAllocationStrategy(int absolute
     /// The number of ongoing rebalancing processes can be limited by `maxSimultaneousRebalance`.
     /// </summary>
     [Serializable]
+    [Obsolete("Use ShardAllocationStrategy.LeastShardAllocationStrategy instead. This will be removed in v1.6.")]
     public class LeastShardAllocationStrategy : AbstractLeastShardAllocationStrategy
     {
         private readonly int _rebalanceThreshold;

diff --git a/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj b/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <AssemblyTitle>Akka.DistributedData.LightningDB</AssemblyTitle>
@@ -14,7 +14,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="LightningDB" Version="0.15.0"/>
+        <PackageReference Include="LightningDB" Version="0.16.0"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj b/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj
@@ -15,7 +15,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Data.SQLite" Version="7.0.11"/>
+        <PackageReference Include="Microsoft.Data.SQLite" Version="7.0.13"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveClusterSharding.DotNet.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveClusterSharding.DotNet.verified.txt
@@ -180,6 +180,8 @@ namespace Akka.Cluster.Sharding
     {
         void Start();
     }
+    [System.ObsoleteAttribute("Use ShardAllocationStrategy.LeastShardAllocationStrategy instead. This will be re" +
+        "moved in v1.6.")]
     public class LeastShardAllocationStrategy : Akka.Cluster.Sharding.Internal.AbstractLeastShardAllocationStrategy
     {
         public LeastShardAllocationStrategy(int rebalanceThreshold, int maxSimultaneousRebalance) { }

diff --git a/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveClusterSharding.Net.verified.txt b/src/core/Akka.API.Tests/verify/CoreAPISpec.ApproveClusterSharding.Net.verified.txt
@@ -180,6 +180,8 @@ namespace Akka.Cluster.Sharding
     {
         void Start();
     }
+    [System.ObsoleteAttribute("Use ShardAllocationStrategy.LeastShardAllocationStrategy instead. This will be re" +
+        "moved in v1.6.")]
     public class LeastShardAllocationStrategy : Akka.Cluster.Sharding.Internal.AbstractLeastShardAllocationStrategy
     {
         public LeastShardAllocationStrategy(int rebalanceThreshold, int maxSimultaneousRebalance) { }

diff --git a/src/core/Akka/Util/SpanHacks.cs b/src/core/Akka/Util/SpanHacks.cs
@@ -39,7 +39,7 @@ public static int Parse(ReadOnlySpan<char> str)
             if (int.TryParse(str, out var i))
                 return i;
 #endif
-            throw new FormatException($"[{str.ToString()}] is now a valid numeric format");
+            throw new FormatException($"[{str.ToString()}] is not a valid numeric format");
         }
 
         private const char Negative = '-';

diff --git a/src/examples/Akka.Persistence.Custom/Akka.Persistence.Custom.csproj b/src/examples/Akka.Persistence.Custom/Akka.Persistence.Custom.csproj
@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Data.SQLite" Version="7.0.11" />
+        <PackageReference Include="Microsoft.Data.SQLite" Version="7.0.13" />
     </ItemGroup>
 
     <ItemGroup>