E611 JAVA-877: Don't wait NEW_NODE_DELAY_SECONDS if protocol version = V4. by olim7t · Pull Request #482 · apache/cassandra-java-driver · GitHub
[go: up one dir, main page]
Skip to content

JAVA-877: Don't wait NEW_NODE_DELAY_SECONDS if protocol version = V4. #482

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
olim7t merged 1 commit into from
Oct 12, 2015
Merged

JAVA-877: Don't wait NEW_NODE_DELAY_SECONDS if protocol version = V4. #482

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
1 change: 1 addition & 0 deletions changelog/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

- [improvement] Change default consistency level to LOCAL_QUORUM (JAVA-926)
- [bug] Fix implementation of UserType.hashCode() (JAVA-942)
- [improvement] Don't delay UP/ADDED notifications if protocol version = V4 (JAVA-877)


### 3.0.0-alpha3
Expand Down
43 changes: 24 additions & 19 deletions driver-core/src/main/java/com/datastax/driver/core/Cluster.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2586,26 +2586,31 @@ private ListenableFuture<?> execute(ExceptionCatchingRunnable task) {
private ListenableFuture<?> schedule(final ExceptionCatchingRunnable task) {
// Cassandra tends to send notifications for new/up nodes a bit early (it is triggered once
// gossip is up, but that is before the client-side server is up), so we add a delay
// (otherwise the connection will likely fail and have to be retry which is wasteful). This
// probably should be fixed C* side, after which we'll be able to remove this.
final SettableFuture<?> future = SettableFuture.create();
scheduledTasksExecutor.schedule(new ExceptionCatchingRunnable() {
public void runMayThrow() throws Exception {
ListenableFuture<?> f = execute(task);
Futures.addCallback(f, new FutureCallback<Object>() {
@Override
public void onSuccess(Object result) {
future.set(null);
}
// (otherwise the connection will likely fail and have to be retry which is wasteful).
// This has been fixed by CASSANDRA-8236 and does not apply to protocol versions >= 4
// and C* versions >= 2.2.0
if (protocolVersion().compareTo(ProtocolVersion.V4) < 0) {
final SettableFuture<?> future = SettableFuture.create();
scheduledTasksExecutor.schedule(new ExceptionCatchingRunnable() {
public void runMayThrow() throws Exception {
ListenableFuture<?> f = execute(task);
Futures.addCallback(f, new FutureCallback<Object>() {
@Override
public void onSuccess(Object result) {
future.set(null);
}

@Override
public void onFailure(Throwable t) {
future.setException(t);
}
});
}
}, NEW_NODE_DELAY_SECONDS, TimeUnit.SECONDS);
return future;
@Override
public void onFailure(Throwable t) {
future.setException(t);
}
});
}
}, NEW_NODE_DELAY_SECONDS, TimeUnit.SECONDS);
return future;
} else {
return execute(task);
}
}

// Make sure we call controlConnection.refreshNodeInfo(host)
Expand Down
0