Skip to content

Fixes deadlock in Node startup. #60

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

Merged
merged 1 commit into from
Apr 2, 2025
Merged

Fixes deadlock in Node startup. #60

Show file tree
Hide file tree
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
11 changes: 6 additions & 5 deletions benchmarks-aeron/src/main/java/uk/co/real_logic/benchmarks/aeron/remote/ArchiveNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public final class ArchiveNode implements AutoCloseable, Runnable
private final boolean ownsArchiveClient;
private final ExclusivePublication publication;
private final Subscription subscription;
private final Aeron aeron;

ArchiveNode(final AtomicBoolean running)
{
Expand All @@ -65,7 +66,7 @@ public final class ArchiveNode implements AutoCloseable, Runnable
this.aeronArchive = aeronArchive;
this.ownsArchiveClient = ownsArchiveClient;

final Aeron aeron = aeronArchive.context().aeron();
this.aeron = aeronArchive.context().aeron();

subscription = aeron.addSubscription(destinationChannel(), destinationStreamId());

Expand All @@ -76,17 +77,17 @@ public final class ArchiveNode implements AutoCloseable, Runnable
final int publicationSessionId = publication.sessionId();
final String channel = addSessionId(recordChannel, publicationSessionId);
aeronArchive.startRecording(channel, recordStreamId, LOCAL, true);
}

public void run()
{
awaitConnected(
() -> subscription.isConnected() && publication.isConnected(),
connectionTimeoutNs(),
SystemNanoClock.INSTANCE);

awaitRecordingStart(aeron, publicationSessionId, aeronArchive.archiveId());
}
awaitRecordingStart(aeron, publication.sessionId(), aeronArchive.archiveId());

public void run()
{
pipeMessages(subscription, publication, running);
}

Expand Down
6 changes: 3 additions & 3 deletions benchmarks-aeron/src/main/java/uk/co/real_logic/benchmarks/aeron/remote/EchoNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,15 +89,15 @@ public final class EchoNode implements AutoCloseable, Runnable
.commit();
}
};
}

public void run()
{
awaitConnected(
() -> subscription.isConnected() && publication.isConnected() && publication.availableWindow() > 0,
connectionTimeoutNs(),
SystemNanoClock.INSTANCE);
}

public void run()
{
final IdleStrategy idleStrategy = idleStrategy();

final AtomicBoolean running = this.running;
Expand Down
11 changes: 6 additions & 5 deletions benchmarks-aeron/src/main/java/uk/co/real_logic/benchmarks/aeron/remote/ReplayNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public final class ReplayNode implements AutoCloseable, Runnable
private final MediaDriver mediaDriver;
private final AeronArchive aeronArchive;
private final boolean ownsArchiveClient;
private final Image image;
private final int sessionId;
private Image image;

ReplayNode(final AtomicBoolean running)
{
Expand Down Expand Up @@ -89,7 +90,7 @@ public final class ReplayNode implements AutoCloseable, Runnable
final String replayChannel = replayChannel();
final int replayStreamId = replayStreamId();
final long replaySessionId = replayFullRecording(aeronArchive, recordingId, replayChannel, replayStreamId);
final int sessionId = (int)replaySessionId;
this.sessionId = (int)replaySessionId;

subscription = aeron.addSubscription(addSessionId(replayChannel, sessionId), replayStreamId);

Expand All @@ -109,17 +110,17 @@ public final class ReplayNode implements AutoCloseable, Runnable
.commit();
}
};
}

public void run()
{
awaitConnected(
() -> subscription.isConnected() && publication.isConnected(),
connectionTimeoutNs(),
SystemNanoClock.INSTANCE);

image = subscription.imageBySessionId(sessionId);
}

public void run()
{
final IdleStrategy idleStrategy = idleStrategy();

final AtomicBoolean running = this.running;
Expand Down