You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by st...@apache.org on 2016/07/11 02:59:08 UTC
[2/4] cassandra git commit: Partial revert of CASSANDRA-11971,
cannot recycle buffer in SP.sendMessagesToNonlocalDC
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/d20c765a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d20c765a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d20c765a
Branch: refs/heads/cassandra-3.9
Commit: d20c765a7d962b55ce905f393589869dab63d996
Parents: 1417a51
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Fri Jul 8 10:26:47 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Jul 11 10:57:27 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/d20c765a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b094b00..9df49f3 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.9
+ * Partial revert of CASSANDRA-11971, cannot recycle buffer in SP.sendMessagesToNonlocalDC (CASSANDRA-11950)
* Fix hdr logging for single operation workloads (CASSANDRA-12145)
* Fix SASI PREFIX search in CONTAINS mode with partial terms (CASSANDRA-12073)
* Increase size of flushExecutor thread pool (CASSANDRA-12071)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d20c765a/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 c88c449..3ce8013 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -1284,8 +1284,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())
@@ -1311,10 +1310,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)