Skip to content

[pull] master from apache:master #612

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 18, 2026
Merged

[pull] master from apache:master #612

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
15 changes: 14 additions & 1 deletion sdks/java/io/cassandra/src/main/java/org/apache/beam/sdk/io/cassandra/ConnectionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +59,22 @@ private static String readToSessionHash(Read<?> read) {
}

static Session getSession(Read<?> read) {
String clusterHash = readToClusterHash(read);
String sessionHash = readToSessionHash(read);

Cluster cachedCluster = clusterMap.get(clusterHash);

if (cachedCluster != null && cachedCluster.isClosed()) {
Session brokenSession = sessionMap.get(sessionHash);
if (brokenSession != null) {
sessionMap.remove(sessionHash, brokenSession);
}
// Removing broken cluster object
clusterMap.remove(clusterHash, cachedCluster);
}
Cluster cluster =
clusterMap.computeIfAbsent(
readToClusterHash(read),
clusterHash,
k ->
CassandraIO.getCluster(
Objects.requireNonNull(read.hosts()),
Expand Down
30 changes: 30 additions & 0 deletions sdks/java/io/cassandra/src/test/java/org/apache/beam/sdk/io/cassandra/CassandraIOTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;

import com.datastax.driver.core.Cluster;
Expand Down Expand Up @@ -1218,4 +1221,31 @@ public int hashCode() {
return Objects.hashCode(tableColumn, indexColumn, valueColumn, data);
}
}

@Test
public void testSessionEvictionOnClosedCluster() {
CassandraIO.Read<String> readConfig =
CassandraIO.<String>read()
.withHosts(Collections.singletonList(CASSANDRA_HOST))
.withPort(cassandraPort)
.withKeyspace(CASSANDRA_KEYSPACE)
.withTable(CASSANDRA_TABLE);

Session initialSession = ConnectionManager.getSession(readConfig);
Cluster initialCluster = initialSession.getCluster();

initialCluster.close();
assertTrue("Cluster should be closed", initialCluster.isClosed());

Session newSession = ConnectionManager.getSession(readConfig);
Cluster newCluster = newSession.getCluster();

assertNotNull("New session should not be null", newSession);
assertFalse("New cluster should be open", newCluster.isClosed());

assertNotSame(
"ConnectionManager should create a new Session instance", initialSession, newSession);
assertNotSame(
"ConnectionManager should create a new Cluster instance", initialCluster, newCluster);
}
}
Loading