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

enable ChannelTaskScheduler to work inside Akka.Cluster without causing errors inside /system actors #5861

Merged
merged 12 commits into from
May 5, 2022
Merged

enable ChannelTaskScheduler to work inside Akka.Cluster without causing errors inside /system actors #5861

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7b2fe34
close #5498
Aaronontheweb Apr 21, 2022
f4e5e11
fix `HeartbeatSender`
Aaronontheweb Apr 21, 2022
66ddd88
cleaned up SBR internals (style)
Aaronontheweb Apr 21, 2022
70f7248
cleaned up some comments
Aaronontheweb Apr 21, 2022
5c648eb
Merge branch 'v1.4' into fix-channel-executor-startup
Aaronontheweb Apr 21, 2022
26d12af
asynchronously attempt to acquire `Cluster` inside SBR
Aaronontheweb Apr 21, 2022
3745a51
Merge branch 'fix-channel-executor-startup' of https://github.com/Aar…
Aaronontheweb Apr 21, 2022
1002e2b
fixed SBR compilation
Aaronontheweb Apr 21, 2022
5966640
Update SplitBrainResolver.cs
Aaronontheweb Apr 21, 2022
d6195aa
Merge branch 'v1.4' into fix-channel-executor-startup
Aaronontheweb Apr 22, 2022
cffd195
Merge branch 'v1.4' into fix-channel-executor-startup
Aaronontheweb May 5, 2022
08a7b5c
subscribe on PreStart
Aaronontheweb May 5, 2022
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
2 changes: 1 addition & 1 deletion src/core/Akka.Cluster/ClusterDaemon.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -895,7 +895,7 @@ private void CreateChildren(Cluster cluster)
_cluster = cluster;
_coreSupervisor = Context.ActorOf(Props.Create<ClusterCoreSupervisor>(), "core");

Context.ActorOf(ClusterHeartbeatReceiver.Props(() => _cluster), "heartbeatReceiver");
Copy link
Member Author

Choose a reason for hiding this comment

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

Avoid creating a delegate for the Lazy<Cluster> that we're removing from the HeartbeatReceiver

Context.ActorOf(ClusterHeartbeatReceiver.Props(cluster), "heartbeatReceiver");
}

protected override void PostStop()
Expand Down
14 changes: 7 additions & 7 deletions src/core/Akka.Cluster/ClusterHeartbeat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ internal sealed class ClusterHeartbeatReceiver : UntypedActor
{
// Important - don't use Cluster.Get(Context.System) in constructor because that would
// cause deadlock. See startup sequence in ClusterDaemon.
private readonly Lazy<Cluster> _cluster;
Copy link
Member Author

Choose a reason for hiding this comment

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

No real reason for a Lazy<Cluster> here since we're already receiving an instance in this actor's constructor at the time it's created.

private readonly Cluster _cluster;

public bool VerboseHeartbeat => _cluster.Value.Settings.VerboseHeartbeatLogging;
public bool VerboseHeartbeat => _cluster.Settings.VerboseHeartbeatLogging;

/// <summary>
/// TBD
/// </summary>
public ClusterHeartbeatReceiver(Func<Cluster> getCluster)
public ClusterHeartbeatReceiver(Cluster cluster)
{
_cluster = new Lazy<Cluster>(getCluster);
_cluster = cluster;
}

protected override void OnReceive(object message)
Expand All @@ -44,8 +44,8 @@ protected override void OnReceive(object message)
{
case ClusterHeartbeatSender.Heartbeat hb:
// TODO log the sequence nr once serializer is enabled
if(VerboseHeartbeat) _cluster.Value.CurrentInfoLogger.LogDebug("Heartbeat from [{0}]", hb.From);
Sender.Tell(new ClusterHeartbeatSender.HeartbeatRsp(_cluster.Value.SelfUniqueAddress,
if(VerboseHeartbeat) _cluster.CurrentInfoLogger.LogDebug("Heartbeat from [{0}]", hb.From);
Sender.Tell(new ClusterHeartbeatSender.HeartbeatRsp(_cluster.SelfUniqueAddress,
hb.SequenceNr, hb.CreationTimeNanos));
break;
default:
Expand All @@ -54,7 +54,7 @@ protected override void OnReceive(object message)
}
}

public static Props Props(Func<Cluster> getCluster)
public static Props Props(Cluster getCluster)
{
return Akka.Actor.Props.Create(() => new ClusterHeartbeatReceiver(getCluster));
}
Expand Down