Skip to content

PersistentStreams should be re-established on reconnect requests #411

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
smcvb merged 2 commits into from
Feb 10, 2025
+45 −20
Merged

PersistentStreams should be re-established on reconnect requests #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd74f95
PersistentStreams must report error on reconnect request
abuijze Feb 6, 2025
4d24d74
Added Javadoc.
abuijze Feb 10, 2025
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
1 change: 0 additions & 1 deletion src/main/java/io/axoniq/axonserver/connector/event/impl/BufferedPersistentStreamSegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,6 @@ public int segment() {

@Override
public void close() {
super.close();
if (closed.compareAndSet(false, true)) {
logger.info("{}: Close segment {}", streamId, segment);
localOnAvailableCallback.run();
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/io/axoniq/axonserver/connector/event/impl/EventChannelImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,20 @@ public synchronized void connect() {
@Override
public void reconnect() {
closeEventStreams();
persistedEventStreams.forEach(PersistentStreamImpl::triggerReconnect);
persistedEventStreams.clear();
}

@Override
public void disconnect() {
closeEventStreams();
persistedEventStreams.forEach(PersistentStreamImpl::close);
persistedEventStreams.clear();
}

private void closeEventStreams() {
buffers.forEach(BufferedEventStream::close);
buffers.clear();
persistedEventStreams.forEach(PersistentStreamImpl::close);
persistedEventStreams.clear();
}

@Override
Expand Down
58 changes: 41 additions & 17 deletions src/main/java/io/axoniq/axonserver/connector/event/impl/PersistentStreamImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package io.axoniq.axonserver.connector.event.impl;

import io.axoniq.axonserver.connector.AxonServerException;
import io.axoniq.axonserver.connector.ErrorCategory;
import io.axoniq.axonserver.connector.event.PersistentStream;
import io.axoniq.axonserver.connector.event.PersistentStreamCallbacks;
import io.axoniq.axonserver.connector.event.PersistentStreamSegment;
Expand All @@ -27,6 +29,7 @@
import io.axoniq.axonserver.grpc.streams.StreamSignal;
import io.grpc.stub.ClientCallStreamObserver;
import io.grpc.stub.ClientResponseObserver;
import io.grpc.stub.StreamObserver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand All @@ -41,6 +44,8 @@
import java.util.function.Consumer;
import javax.annotation.Nullable;

import static io.axoniq.axonserver.connector.impl.ObjectUtils.doIfNotNull;

/**
* Implementation of the {@link PersistentStream}.
*/
Expand Down Expand Up @@ -120,6 +125,21 @@ public void openConnection(InitializationProperties initializationProperties) {
outboundStreamHolder.get().onNext(StreamRequest.newBuilder().setOpen(openRequest.build()).build());
}

/**
* Close this stream and signal downstream consumer that the stream is closed "erroneously" in order to trigger
* reconnect mechanisms. This is to ensure that consumers of this stream can distinguish between regularly closed
* streams, and those closed with the intent to re-establish a connection.
*/
public void triggerReconnect() {
// first, close gracefully
close();
AxonServerException reconnectRequested = new AxonServerException(ErrorCategory.OTHER,
"Client initiated reconnect",
"client");
// notify clients that the connection "failed" and should be reconnected
onClosedCallback.get().accept(reconnectRequested);
}

@Override
public void close() {
if (closed.compareAndSet(false, true)) {
Expand Down Expand Up @@ -175,8 +195,8 @@ private BufferedPersistentStreamSegment getPersistentStreamSegment(int segmentNr
segmentNr,
bufferSize,
refillBatch,
progress -> acknowledge(s,progress),
error -> sendError(s,error));
progress -> acknowledge(s, progress),
error -> sendError(s, error));
stream.beforeStart(outboundStreamHolder.get());
stream.enableFlowControl();
return stream;
Expand All @@ -191,27 +211,31 @@ private BufferedPersistentStreamSegment getPersistentStreamSegment(int segmentNr
}

private void acknowledge(int segment, long progress) {
outboundStreamHolder.get().onNext(StreamRequest.newBuilder()
.setAcknowledgeProgress(ProgressAcknowledgement.newBuilder()
.setSegment(
segment)
.setPosition(
progress)
.build())
.build());
try {
doIfNotNull(outboundStreamHolder.get(), call -> call.onNext(
StreamRequest.newBuilder()
.setAcknowledgeProgress(ProgressAcknowledgement.newBuilder()
.setSegment(segment)
.setPosition(progress)
.build())
.build()));
} catch (Exception e) {
logger.debug("Failed to send acknowledgement.", e);
}
if (progress == PersistentStreamSegment.PENDING_WORK_DONE_MARKER) {
logger.info("{}: Close confirmed for segment {}", streamId, segment);
closeConfirmationsSent.add(segment);
}
}

private void sendError(int segment, String error) {
outboundStreamHolder.get().onNext(StreamRequest.newBuilder()
.setError(SegmentError.newBuilder()
.setSegment(segment)
.setError(error)
.build())
.build());
doIfNotNull(outboundStreamHolder.get(),
osh -> osh.onNext(StreamRequest.newBuilder()
.setError(SegmentError.newBuilder()
.setSegment(segment)
.setError(error)
.build())
.build()));
}

@Override
Expand All @@ -228,7 +252,7 @@ public void onCompleted() {

private void sendCompleted() {
try {
outboundStreamHolder.get().onCompleted();
doIfNotNull(outboundStreamHolder.getAndSet(null), StreamObserver::onCompleted);
} catch (Exception ex) {
// Ignore exception
}
Expand Down