Skip to content

Fix issues with reconnection #225

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 2 commits into from
Apr 5, 2019
Merged

Fix issues with reconnection #225

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
95a229a
add timeout to readInitialInfo
yuanmwang-wf Apr 3, 2019
7f7640c
close connect executor when connection closes
yuanmwang-wf Apr 3, 2019
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
27 changes: 23 additions & 4 deletions src/main/java/io/nats/client/impl/NatsConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.CancellationException;
import java.util.concurrent.Callable;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
Expand Down Expand Up @@ -119,6 +120,7 @@ class NatsConnection implements Connection {
private ExecutorService callbackRunner;

private ExecutorService executor;
private ExecutorService connectExecutor;

NatsConnection(Options options) {
this.options = options;
Expand Down Expand Up @@ -153,6 +155,7 @@ class NatsConnection implements Connection {
this.callbackRunner = Executors.newSingleThreadExecutor();

this.executor = options.getExecutor();
this.connectExecutor = Executors.newSingleThreadExecutor();
Copy link

@kevinfrommelt-wf kevinfrommelt-wf Apr 3, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

Do we want to shutdown the connectExecutor during close similar to the callbackRunner?
https://github.com/nats-io/java-nats/blob/95a229a38eab802491593808f98501053deb05aa/src/main/java/io/nats/client/impl/NatsConnection.java#L549-L555

}

// Connect is only called after creation
Expand Down Expand Up @@ -308,9 +311,21 @@ void tryToConnect(String serverURI) {

// Wait for the INFO message manually
// all other traffic will use the reader and writer
readInitialInfo();
checkVersionRequirements();
upgradeToSecureIfNeeded();
Callable<Object> connectTask = new Callable<Object>() {
public Object call() throws IOException {
readInitialInfo();
checkVersionRequirements();
upgradeToSecureIfNeeded();
return null;
}
};

Future<Object> future = this.connectExecutor.submit(connectTask);
try {
future.get(this.options.getConnectionTimeout().toNanos(), TimeUnit.NANOSECONDS);
} finally {
future.cancel(true);
}

// start the reader and writer after we secured the connection, if necessary
this.reader.start(this.dataPortFuture);
Expand Down Expand Up @@ -459,6 +474,7 @@ void closeSocket(boolean tryReconnectIfConnected) throws InterruptedException {
statusLock.lock();
try {
updateStatus(Status.DISCONNECTED);
this.exceptionDuringConnectChange = null; // Ignore IOExceptions during closeSocketImpl()
this.disconnecting = false;
statusChanged.signalAll();
} finally {
Expand Down Expand Up @@ -541,14 +557,17 @@ void close(boolean checkDrainStatus) throws InterruptedException {
statusLock.unlock();
}

// Stop the error handler code
// Stop the error handling and connect executors
callbackRunner.shutdown();
try {
callbackRunner.awaitTermination(this.options.getConnectionTimeout().toNanos(), TimeUnit.NANOSECONDS);
} finally {
callbackRunner.shutdownNow();
}

// There's no need to wait for running tasks since we're told to close
connectExecutor.shutdownNow();

statusLock.lock();
try {
this.disconnecting = false;
Expand Down