Skip to content

Add invoker-mode and async leader-change support to AeronCluster #147

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

Open
strangelydim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add invoker-mode and async leader-change support to AeronCluster #147

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
111 changes: 104 additions & 7 deletions src/Adaptive.Cluster/Client/AeronCluster.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,6 +1029,27 @@ internal static Publication AddIngressPublication(Context ctx, string channel, i
}
}

private Publication AddNewLeaderIngressPublication(Context ctx, string channel, int streamId)
{
long registrationId = AsyncAddIngressPublication(ctx, channel, streamId);
long deadlineNs = nanoClock.NanoTime() + ctx.MessageTimeoutNs();
do
{
Publication publication = GetIngressPublication(ctx, registrationId);
if (null != publication)
{
return publication;
}
_idleStrategy.Idle(ctx.RunAgentInvokers());
}
while (nanoClock.NanoTime() < deadlineNs);

throw new AeronTimeoutException(
"failed to add new leader ingress publication (leaderMemberId=" + _leaderMemberId +
", leadershipTermId=" + _leadershipTermId + ", channel=" + channel + ", streamId=" + streamId +
") within " + ctx.MessageTimeoutNs() + "ns");
}

internal static long AsyncAddIngressPublication(Context ctx, string channel, int streamId)
{
if (ctx.IsIngressExclusive())
Expand Down Expand Up @@ -1059,8 +1080,15 @@ private void UpdateMemberEndpoints(string ingressEndpoints, int leaderMemberId)

var map = ParseIngressEndpoints(_ctx, ingressEndpoints);
var newLeader = map.Get(leaderMemberId);
newLeader.CreateIngressPublication();
_publication = newLeader.publication;

ChannelUri channelUri = ChannelUri.Parse(_ctx.IngressChannel());
if (channelUri.IsUdp)
{
channelUri.Put(ENDPOINT_PARAM_NAME, newLeader.endpoint);
}

_publication = newLeader.publication =
AddNewLeaderIngressPublication(_ctx, channelUri.ToString(), _ctx.IngressStreamId());
_endpointByIdMap = map;
}

Expand Down Expand Up @@ -1969,6 +1997,27 @@ public AgentInvoker AgentInvoker()
return agentInvoker;
}

internal int RunAgentInvokers()
{
int workDone = 0;

if (null != _aeron)
{
AgentInvoker conductorAgentInvoker = _aeron.ConductorAgentInvoker;
if (null != conductorAgentInvoker)
{
workDone += conductorAgentInvoker.Invoke();
}
}

if (null != agentInvoker)
{
workDone += agentInvoker.Invoke();
}

return workDone;
}

/// <summary>
/// Close the context and free applicable resources.
/// <para>
Expand Down Expand Up @@ -2168,6 +2217,7 @@ public static string StepName(int step)
public AeronCluster Poll()
{
CheckDeadline();
ctx.RunAgentInvokers();

switch (state)
{
Expand Down Expand Up @@ -2340,6 +2390,11 @@ private void AwaitPublicationConnected()
{
foreach (MemberIngress member in memberByIdMap.Values)
{
if (null == member.publication && NULL_VALUE != member.registrationId)
{
member.AsyncGetPublication();
}

if (null != member.publication && member.publication.IsConnected)
{
ingressPublication = member.publication;
Expand Down Expand Up @@ -2448,15 +2503,28 @@ private void PrepareChallengeResponse(byte[] encodedCredentials)

private void UpdateMembers()
{
leaderMemberId = egressPoller.LeaderMemberId();
MemberIngress oldLeader = memberByIdMap.Remove(leaderMemberId);

CloseHelper.Dispose(ingressPublication);
ingressPublication = null;
CloseHelper.CloseAll(memberByIdMap.Values);

leaderMemberId = egressPoller.LeaderMemberId();

memberByIdMap = ParseIngressEndpoints(ctx, egressPoller.Detail());

MemberIngress leader = memberByIdMap.Get(leaderMemberId);
leader.CreateIngressPublication();
ingressPublication = leader.publication;
MemberIngress newLeader = memberByIdMap.Get(leaderMemberId);
if (null != oldLeader &&
null == oldLeader.publicationException &&
newLeader.endpoint.Equals(oldLeader.endpoint))
{
ingressPublication = newLeader.publication = oldLeader.publication;
newLeader.registrationId = oldLeader.registrationId;
}
else
{
CloseHelper.Dispose(oldLeader);
newLeader.AsyncAddPublication();
}

State(AWAIT_PUBLICATION_CONNECTED);
}
Expand Down Expand Up @@ -2508,6 +2576,35 @@ internal void CreateIngressPublication()

publication = AddIngressPublication(ctx, channelUri.ToString(), ctx.IngressStreamId());
}

internal void AsyncAddPublication()
{
ChannelUri channelUri = ChannelUri.Parse(ctx.IngressChannel());
if (channelUri.IsUdp)
{
channelUri.Put(ENDPOINT_PARAM_NAME, endpoint);
}

registrationId = AsyncAddIngressPublication(ctx, channelUri.ToString(), ctx.IngressStreamId());
publication = null;
}

internal void AsyncGetPublication()
{
try
{
publication = GetIngressPublication(ctx, registrationId);
if (null != publication)
{
registrationId = NULL_VALUE;
}
}
catch (RegistrationException ex)
{
publicationException = ex;
registrationId = NULL_VALUE;
}
}

public void Dispose()
{
Expand Down
Loading