Skip to content

Integration CCMBridge and HostConnectionPoolTest fixes from driver matrix #487

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 3, 2025
Merged

Integration CCMBridge and HostConnectionPoolTest fixes from driver matrix #487

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
3 changes: 3 additions & 0 deletions driver-core/src/test/java/com/datastax/driver/core/CCMBridge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1348,6 +1348,9 @@ private String joinJvmArgs() {
String quote = isWindows() ? "\"" : "";
for (String jvmArg : jvmArgs) {
// Windows requires jvm arguments to be quoted, while *nix requires unquoted.
if (scylla && jvmArg.startsWith("-Dcassandra")) {
continue;
}
allJvmArgs.append(" ");
allJvmArgs.append(quote);
allJvmArgs.append("--jvm_arg=");
Expand Down
10 changes: 5 additions & 5 deletions driver-core/src/test/java/com/datastax/driver/core/HostConnectionPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ public void should_resurrect_trashed_connection_within_idle_timeout() throws Exc
allRequests.addAll(requests);
allRequests.add(MockRequest.send(pool));

verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
assertPoolSize(pool, 2);
Connection connection2 = pool.connections[0].get(1);

Expand Down Expand Up @@ -625,7 +625,7 @@ public void should_resurrect_trashed_connection_within_idle_timeout() throws Exc

// Borrowing one more time should resurrect the trashed connection
allRequests.addAll(MockRequest.sendMany(1, pool));
verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
assertPoolSize(pool, 2);

assertThat(pool.connections[0]).containsExactly(connection2, connection1);
Expand Down Expand Up @@ -664,7 +664,7 @@ public void should_not_resurrect_trashed_connection_after_idle_timeout() throws
allRequests.addAll(requests);
allRequests.add(MockRequest.send(pool));

verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
assertPoolSize(pool, 2);
reset(factory);
Connection connection2 = pool.connections[0].get(1);
Expand Down Expand Up @@ -699,7 +699,7 @@ public void should_not_resurrect_trashed_connection_after_idle_timeout() throws
allRequests.addAll(requests);
allRequests.add(MockRequest.send(pool));
assertThat(connection2.inFlight.get()).isEqualTo(101);
verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
assertPoolSize(pool, 2);

// Borrow again to get the new connection
Expand Down Expand Up @@ -742,7 +742,7 @@ public void should_not_close_trashed_connection_until_no_in_flight() throws Exce
allRequests.addAll(requests);
allRequests.add(MockRequest.send(pool));

verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class));
verify(factory, after(2000).times(1)).open(any(HostConnectionPool.class), anyInt(), anyInt());
assertThat(pool.connections[0]).hasSize(2);

// Return enough times to get back under the threshold where one connection is enough
Expand Down
Loading