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:07 UTC
[1/4] cassandra git commit: Partial revert of CASSANDRA-11971,
cannot recycle buffer in SP.sendMessagesToNonlocalDC
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 <st...@datastax.com>
Authored: Fri Jul 8 10:26:47 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
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)
[2/4] cassandra git commit: Partial revert of CASSANDRA-11971,
cannot recycle buffer in SP.sendMessagesToNonlocalDC
Posted by st...@apache.org.
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)
[3/4] cassandra git commit: Partial revert of CASSANDRA-11971,
cannot recycle buffer in SP.sendMessagesToNonlocalDC
Posted by st...@apache.org.
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/trunk
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)
[4/4] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by st...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5712e6e2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5712e6e2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5712e6e2
Branch: refs/heads/trunk
Commit: 5712e6e2bc619790cc61699aac8ff1958b2ab903
Parents: 09720f8 d20c765
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Mon Jul 11 10:57:42 2016 +0800
Committer: Stefania Alborghetti <st...@datastax.com>
Committed: Mon Jul 11 10:57:42 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/5712e6e2/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 690b1d6,9df49f3..92c6edb
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
+3.10
+ * Reuse DataOutputBuffer from ColumnIndex (CASSANDRA-11970)
+ * Remove DatabaseDescriptor dependency from SegmentedFile (CASSANDRA-11580)
+ * Add supplied username to authentication error messages (CASSANDRA-12076)
+ * Remove pre-startup check for open JMX port (CASSANDRA-12074)
+
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/5712e6e2/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------