Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix OldCoordinatorStateMigrationEventAdapter.Manifest #6176

Merged
merged 7 commits into from
Oct 14, 2022
Merged

Fix OldCoordinatorStateMigrationEventAdapter.Manifest #6176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
225e681
Fix OldCoordinatorStateMigrationEventAdapter.Manifest
Arkatufus Oct 13, 2022
0d8b2aa
Update API Verify list
Arkatufus Oct 13, 2022
f3568e7
Merge branch 'dev' into Fix_#6159_Sharding_manifest_adapter
Aaronontheweb Oct 14, 2022
168fd12
Change `GetManifest()` from public to internal
Arkatufus Oct 14, 2022
ac6d04b
Merge branch 'dev' into Fix_#6159_Sharding_manifest_adapter
Arkatufus Oct 14, 2022
42d1b37
Update API Verify list
Arkatufus Oct 14, 2022
03548f8
Merge branch 'dev' into Fix_#6159_Sharding_manifest_adapter
Aaronontheweb Oct 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<TargetFrameworks>$(NetStandardLibVersion);$(NetLibVersion)</TargetFrameworks>
<PackageTags>$(AkkaPackageTags);network;cluster;sharding</PackageTags>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<LangVersion>8.0</LangVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 6 additions & 1 deletion src/contrib/cluster/Akka.Cluster.Sharding/OldCoordinatorStateMigrationEventAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
// </copyright>
//-----------------------------------------------------------------------

using Akka.Cluster.Sharding.Serialization;
using Akka.Persistence;
using Akka.Persistence.Journal;

namespace Akka.Cluster.Sharding
Expand All @@ -17,7 +19,10 @@ internal sealed class OldCoordinatorStateMigrationEventAdapter : IEventAdapter
{
public string Manifest(object evt)
{
return "";
if (evt is IPersistentRepresentation p)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

return p.Manifest;

return ClusterShardingMessageSerializer.GetManifest(evt);
}

public object ToJournal(object evt)
Expand Down
115 changes: 65 additions & 50 deletions src/contrib/cluster/Akka.Cluster.Sharding/Serialization/ClusterShardingMessageSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,58 +233,73 @@ public override object FromBinary(byte[] bytes, string manifest)
/// This exception is thrown when the specified <paramref name="o"/> does not have an associated manifest.
/// </exception>
/// <returns>The manifest needed for the deserialization of the specified <paramref name="o" />.</returns>
internal static string GetManifest(object o)
=> o switch
{
EventSourcedRememberEntitiesShardStore.State _ => EntityStateManifest,
EventSourcedRememberEntitiesShardStore.EntitiesStarted _ => EntitiesStartedManifest,
EventSourcedRememberEntitiesShardStore.EntitiesStopped _ => EntitiesStoppedManifest,

ShardCoordinator.CoordinatorState _ => CoordinatorStateManifest,
ShardCoordinator.ShardRegionRegistered _ => ShardRegionRegisteredManifest,
ShardCoordinator.ShardRegionProxyRegistered _ => ShardRegionProxyRegisteredManifest,
ShardCoordinator.ShardRegionTerminated _ => ShardRegionTerminatedManifest,
ShardCoordinator.ShardRegionProxyTerminated _ => ShardRegionProxyTerminatedManifest,
ShardCoordinator.ShardHomeAllocated _ => ShardHomeAllocatedManifest,
ShardCoordinator.ShardHomeDeallocated _ => ShardHomeDeallocatedManifest,

ShardCoordinator.Register _ => RegisterManifest,
ShardCoordinator.RegisterProxy _ => RegisterProxyManifest,
ShardCoordinator.RegisterAck _ => RegisterAckManifest,
ShardCoordinator.GetShardHome _ => GetShardHomeManifest,
ShardCoordinator.ShardHome _ => ShardHomeManifest,
ShardCoordinator.HostShard _ => HostShardManifest,
ShardCoordinator.ShardStarted _ => ShardStartedManifest,
ShardCoordinator.BeginHandOff _ => BeginHandOffManifest,
ShardCoordinator.BeginHandOffAck _ => BeginHandOffAckManifest,
ShardCoordinator.HandOff _ => HandOffManifest,
ShardCoordinator.ShardStopped _ => ShardStoppedManifest,
ShardCoordinator.GracefulShutdownRequest _ => GracefulShutdownReqManifest,
ShardCoordinator.RegionStopped _ => RegionStoppedManifest,

ShardRegion.StartEntity _ => StartEntityManifest,
ShardRegion.StartEntityAck _ => StartEntityAckManifest,

Shard.GetShardStats _ => GetShardStatsManifest,
Shard.ShardStats _ => ShardStatsManifest,
GetShardRegionStats _ => GetShardRegionStatsManifest,
ShardRegionStats _ => ShardRegionStatsManifest,
GetClusterShardingStats _ => GetClusterShardingStatsManifest,
ClusterShardingStats _ => ClusterShardingStatsManifest,
GetCurrentRegions _ => GetCurrentRegionsManifest,
CurrentRegions _ => CurrentRegionsManifest,

Shard.GetCurrentShardState _ => GetCurrentShardStateManifest,
Shard.CurrentShardState _ => CurrentShardStateManifest,
GetShardRegionState _ => GetShardRegionStateManifest,
ShardState _ => ShardStateManifest,
CurrentShardRegionState _ => CurrentShardRegionStateManifest,

EventSourcedRememberEntitiesCoordinatorStore.MigrationMarker _ => EventSourcedRememberShardsMigrationMarkerManifest,
EventSourcedRememberEntitiesCoordinatorStore.State _ => EventSourcedRememberShardsState,

_ => string.Empty
};

/// <summary>
/// Returns the manifest (type hint) that will be provided in the <see cref="FromBinary(byte[], string)" /> method.
/// </summary>
/// <param name="o">The object for which the manifest is needed.</param>
/// <exception cref="ArgumentException">
/// This exception is thrown when the specified <paramref name="o"/> does not have an associated manifest.
/// </exception>
/// <returns>The manifest needed for the deserialization of the specified <paramref name="o" />.</returns>
public override string Manifest(object o)
{
switch (o)
{
case EventSourcedRememberEntitiesShardStore.State _: return EntityStateManifest;
case EventSourcedRememberEntitiesShardStore.EntitiesStarted _: return EntitiesStartedManifest;
case EventSourcedRememberEntitiesShardStore.EntitiesStopped _: return EntitiesStoppedManifest;

case ShardCoordinator.CoordinatorState _: return CoordinatorStateManifest;
case ShardCoordinator.ShardRegionRegistered _: return ShardRegionRegisteredManifest;
case ShardCoordinator.ShardRegionProxyRegistered _: return ShardRegionProxyRegisteredManifest;
case ShardCoordinator.ShardRegionTerminated _: return ShardRegionTerminatedManifest;
case ShardCoordinator.ShardRegionProxyTerminated _: return ShardRegionProxyTerminatedManifest;
case ShardCoordinator.ShardHomeAllocated _: return ShardHomeAllocatedManifest;
case ShardCoordinator.ShardHomeDeallocated _: return ShardHomeDeallocatedManifest;

case ShardCoordinator.Register _: return RegisterManifest;
case ShardCoordinator.RegisterProxy _: return RegisterProxyManifest;
case ShardCoordinator.RegisterAck _: return RegisterAckManifest;
case ShardCoordinator.GetShardHome _: return GetShardHomeManifest;
case ShardCoordinator.ShardHome _: return ShardHomeManifest;
case ShardCoordinator.HostShard _: return HostShardManifest;
case ShardCoordinator.ShardStarted _: return ShardStartedManifest;
case ShardCoordinator.BeginHandOff _: return BeginHandOffManifest;
case ShardCoordinator.BeginHandOffAck _: return BeginHandOffAckManifest;
case ShardCoordinator.HandOff _: return HandOffManifest;
case ShardCoordinator.ShardStopped _: return ShardStoppedManifest;
case ShardCoordinator.GracefulShutdownRequest _: return GracefulShutdownReqManifest;
case ShardCoordinator.RegionStopped _: return RegionStoppedManifest;

case ShardRegion.StartEntity _: return StartEntityManifest;
case ShardRegion.StartEntityAck _: return StartEntityAckManifest;

case Shard.GetShardStats _: return GetShardStatsManifest;
case Shard.ShardStats _: return ShardStatsManifest;
case GetShardRegionStats _: return GetShardRegionStatsManifest;
case ShardRegionStats _: return ShardRegionStatsManifest;
case GetClusterShardingStats _: return GetClusterShardingStatsManifest;
case ClusterShardingStats _: return ClusterShardingStatsManifest;
case GetCurrentRegions _: return GetCurrentRegionsManifest;
case CurrentRegions _: return CurrentRegionsManifest;

case Shard.GetCurrentShardState _: return GetCurrentShardStateManifest;
case Shard.CurrentShardState _: return CurrentShardStateManifest;
case GetShardRegionState _: return GetShardRegionStateManifest;
case ShardState _: return ShardStateManifest;
case CurrentShardRegionState _: return CurrentShardRegionStateManifest;

case EventSourcedRememberEntitiesCoordinatorStore.MigrationMarker _: return EventSourcedRememberShardsMigrationMarkerManifest;
case EventSourcedRememberEntitiesCoordinatorStore.State _: return EventSourcedRememberShardsState;
}
throw new ArgumentException($"Can't serialize object of type [{o.GetType()}] in [{GetType()}]");
var man = GetManifest(o);
if(ReferenceEquals(man, string.Empty))
throw new ArgumentException($"Can't serialize object of type [{o.GetType()}] in [{GetType()}]");
return man;
}

//
Expand Down