Repository: cassandra Updated Branches: refs/heads/cassandra-3.8 c31701f60 -> 5578d3c7b refs/heads/cassandra-3.9 1417a516c -> d20c765a7 refs/heads/trunk 09720f81d -> 5712e6e2b
Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC patch by Stefania Alborghetti; reviewed by Jake Luciani for CASSANDRA-11950 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5578d3c7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5578d3c7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5578d3c7 Branch: refs/heads/cassandra-3.8 Commit: 5578d3c7b997146e5320b18e2a8134ee79db6f42 Parents: c31701f Author: Stefania Alborghetti <[email protected]> Authored: Fri Jul 8 10:26:47 2016 +0800 Committer: Stefania Alborghetti <[email protected]> Committed: Mon Jul 11 10:53:29 2016 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageProxy.java | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5578d3c7/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3bd691a..df522ec 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.8 + * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950) * Upgrade netty to 4.0.37 (CASSANDRA-12032, CASSANDRA-12034) * Improve details in compaction log message (CASSANDRA-12080) * Allow unset values in CQLSSTableWriter (CASSANDRA-11911) http://git-wip-us.apache.org/repos/asf/cassandra/blob/5578d3c7/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 90c246e..6aee697 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -1282,8 +1282,7 @@ public class StorageProxy implements StorageProxyMBean InetAddress target = iter.next(); // Add the other destinations of the same message as a FORWARD_HEADER entry - DataOutputBuffer out = null; - try (DataOutputBuffer ignored = out = DataOutputBuffer.RECYCLER.get()) + try(DataOutputBuffer out = new DataOutputBuffer()) { out.writeInt(targets.size() - 1); while (iter.hasNext()) @@ -1309,10 +1308,6 @@ public class StorageProxy implements StorageProxyMBean // DataOutputBuffer is in-memory, doesn't throw IOException throw new AssertionError(e); } - finally - { - out.recycle(); - } } private static void performLocally(Stage stage, final Runnable runnable)
