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

Akka.Cluster.Hosting: don't use sharding delegates #424

Merged
merged 1 commit into from
Jan 9, 2024
Merged

Akka.Cluster.Hosting: don't use sharding delegates #424

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 19 additions & 26 deletions src/Akka.Cluster.Hosting/AkkaClusterHostingExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,28 +628,6 @@ public static AkkaConfigurationBuilder WithClustering(
return hoconBuilder.WithActorRefProvider(ProviderSelection.Cluster.Instance);
}

private static ExtractEntityId ToExtractEntityId(this IMessageExtractor self)
{
Option<(string, object)> ExtractEntityId(object msg)
{
if (self.EntityId(msg) != null) return (self.EntityId(msg), self.EntityMessage(msg));

return Option<(string, object)>.None;
}

return ExtractEntityId;
}

private static ExtractShardId ToExtractShardId(this IMessageExtractor self)
{
string? ExtractShardId(object msg)
{
return self.EntityId(msg) != null ? self.ShardId(msg) : null;
}

return ExtractShardId;
}

public static AkkaConfigurationBuilder WithDistributedData(
this AkkaConfigurationBuilder builder,
Action<DDataOptions> configurator)
Expand Down Expand Up @@ -702,7 +680,7 @@ public static AkkaConfigurationBuilder WithShardRegion<TKey>(
ShardOptions shardOptions)
{
return builder.WithShardRegion<TKey>(typeName, (_, _, _) => entityPropsFactory,
messageExtractor.ToExtractEntityId(), messageExtractor.ToExtractShardId(), shardOptions);
messageExtractor, shardOptions);
}

/// <summary>
Expand Down Expand Up @@ -785,7 +763,7 @@ public static AkkaConfigurationBuilder WithShardRegion<TKey>(
{
return builder.WithShardRegion<TKey>(typeName,
(system, registry, _) => entityPropsFactory(system, registry),
messageExtractor.ToExtractEntityId(), messageExtractor.ToExtractShardId(), shardOptions);
messageExtractor, shardOptions);
}

/// <summary>
Expand Down Expand Up @@ -869,8 +847,23 @@ public static AkkaConfigurationBuilder WithShardRegion<TKey>(
IMessageExtractor messageExtractor,
ShardOptions shardOptions)
{
return builder.WithShardRegion<TKey>(typeName, entityPropsFactory,
messageExtractor.ToExtractEntityId(), messageExtractor.ToExtractShardId(), shardOptions);
shardOptions.Apply(builder);
Copy link
Member Author

Choose a reason for hiding this comment

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

had to move 1st citizen sharding code here, although it kind of duplicates the methods that work directly with the Extractor delegates right now.

builder.AddHocon(
ClusterSharding.DefaultConfig().WithFallback(DistributedData.DistributedData.DefaultConfig()),
HoconAddMode.Append);

return builder.StartActors(Resolver);

async Task Resolver(ActorSystem system, IActorRegistry registry, IDependencyResolver resolver)
{
var props = entityPropsFactory(system, registry, resolver);
var settings = ClusterShardingSettings.Create(system);
var allocationStrategy = ClusterSharding.Get(system).DefaultShardAllocationStrategy(settings);
var shardRegion = await ClusterSharding.Get(system).StartAsync(
typeName, props, settings, messageExtractor, allocationStrategy,
shardOptions.HandOffStopMessage ?? PoisonPill.Instance).ConfigureAwait(false);
registry.Register<TKey>(shardRegion);
}
}

/// <summary>
Expand Down
Loading