Always close cluster with connection in CqlRecordWriter patch by Artem Aliev; reviewed by Aleksey Yeschenko for CASSANDRA-11553
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/77ab7732 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/77ab7732 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/77ab7732 Branch: refs/heads/cassandra-3.0 Commit: 77ab77328e7e263a8e93ff24ff9b5d4be33e7c27 Parents: 37f63ec Author: Artem Aliev <artem.al...@gmail.com> Authored: Mon Apr 18 15:24:12 2016 +0100 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Mon Apr 18 15:25:14 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 4 ++++ src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/77ab7732/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index c72b6cb..baaf227 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,7 @@ +2.2.7 + * Always close cluster with connection in CqlRecordWriter (CASSANDRA-11553) + + 2.2.6 * Allow only DISTINCT queries with partition keys restrictions (CASSANDRA-11339) * CqlConfigHelper no longer requires both a keystore and truststore to work (CASSANDRA-11532) http://git-wip-us.apache.org/repos/asf/cassandra/blob/77ab7732/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java index 84102a5..e3d1772 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java @@ -231,7 +231,7 @@ class CqlRecordWriter extends RecordWriter<Map<String, ByteBuffer>, List<ByteBuf try { if (session != null) - session.close(); + session.getCluster().closeAsync(); } catch (Throwable t) {
