You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2015/09/29 19:09:58 UTC
[01/10] cassandra git commit: Fix dropping undroppable when message
queue is full
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 39ab9e052 -> 4c6411f08
refs/heads/cassandra-2.2 a323641ef -> fc675450e
refs/heads/cassandra-3.0 cf0b737f1 -> 8bb7077e8
refs/heads/trunk 8765e6a86 -> ed65ff99c
Fix dropping undroppable when message queue is full
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10113
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c6411f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c6411f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c6411f0
Branch: refs/heads/cassandra-2.1
Commit: 4c6411f083b9448114a0ba349fc02e60299f6541
Parents: 39ab9e0
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 17 21:31:58 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:01 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index deec093..3364dcd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.10
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 27949c6..8b83119 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -518,6 +518,8 @@ public class OutboundTcpConnection extends Thread
while (iter.hasNext())
{
QueuedMessage qm = iter.next();
+ if (!qm.droppable)
+ continue;
if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
return;
iter.remove();
[07/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc675450
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc675450
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc675450
Branch: refs/heads/trunk
Commit: fc675450e9569a1555faa43c126cd0e5d91862e0
Parents: a323641 4c6411f
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Sep 29 12:00:24 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:24 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f3a6d44,3364dcd..c36c6f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.1.10
+2.2.2
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+ * Configurable page size in cqlsh (CASSANDRA-9855)
+ * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
+ * Cancel transaction for sstables we wont redistribute index summary
+ for (CASSANDRA-10270)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
+ * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
+ * Fix repair hang when snapshot failed (CASSANDRA-10057)
+ * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
+ (CASSANDRA-10199)
+Merged from 2.1:
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bb7077e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bb7077e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bb7077e
Branch: refs/heads/trunk
Commit: 8bb7077e87afbad37da44e8df4bf5ab218a7183c
Parents: cf0b737 fc67545
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Sep 29 12:00:33 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:33 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bb7077e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b3b1cdd,c36c6f5..cbd4632
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,17 +1,37 @@@
-2.2.2
+3.0
+Merged from 2.2:
* cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+
+
+3.0.0-rc1
+ * Fix mixed version read request compatibility for compact static tables
+ (CASSANDRA-10373)
+ * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
+ * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
+ columns (CASSANDRA-9664)
+ * Move crc_check_chance out of compression options (CASSANDRA-9839)
+ * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
+ * Transfer hints to a different node on decommission (CASSANDRA-10198)
+ * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338)
+ * Add custom query expressions to SELECT (CASSANDRA-10217)
+ * Fix minor bugs in MV handling (CASSANDRA-10362)
+ * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
+ * Improve MV schema representation (CASSANDRA-9921)
+ * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230)
+ * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318)
+ * Give index implementations more control over rebuild operations (CASSANDRA-10312)
+ * Update index file format (CASSANDRA-10314)
+ * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261)
+ * CFS.loadNewSSTables() broken for pre-3.0 sstables
+ * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
+ * Small optimizations of sstable index serialization (CASSANDRA-10232)
+ * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
+Merged from 2.2:
* Configurable page size in cqlsh (CASSANDRA-9855)
* Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
- * Cancel transaction for sstables we wont redistribute index summary
- for (CASSANDRA-10270)
- * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
- * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
- * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
- * Fix repair hang when snapshot failed (CASSANDRA-10057)
- * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
- (CASSANDRA-10199)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
Merged from 2.1:
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
[05/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc675450
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc675450
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc675450
Branch: refs/heads/cassandra-3.0
Commit: fc675450e9569a1555faa43c126cd0e5d91862e0
Parents: a323641 4c6411f
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Sep 29 12:00:24 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:24 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f3a6d44,3364dcd..c36c6f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.1.10
+2.2.2
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+ * Configurable page size in cqlsh (CASSANDRA-9855)
+ * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
+ * Cancel transaction for sstables we wont redistribute index summary
+ for (CASSANDRA-10270)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
+ * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
+ * Fix repair hang when snapshot failed (CASSANDRA-10057)
+ * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
+ (CASSANDRA-10199)
+Merged from 2.1:
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[08/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bb7077e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bb7077e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bb7077e
Branch: refs/heads/cassandra-3.0
Commit: 8bb7077e87afbad37da44e8df4bf5ab218a7183c
Parents: cf0b737 fc67545
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Sep 29 12:00:33 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:33 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bb7077e/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index b3b1cdd,c36c6f5..cbd4632
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,36 -1,17 +1,37 @@@
-2.2.2
+3.0
+Merged from 2.2:
* cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+
+
+3.0.0-rc1
+ * Fix mixed version read request compatibility for compact static tables
+ (CASSANDRA-10373)
+ * Fix paging of DISTINCT with static and IN (CASSANDRA-10354)
+ * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
+ columns (CASSANDRA-9664)
+ * Move crc_check_chance out of compression options (CASSANDRA-9839)
+ * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
+ * Transfer hints to a different node on decommission (CASSANDRA-10198)
+ * Check partition keys for CAS operations during stmt validation (CASSANDRA-10338)
+ * Add custom query expressions to SELECT (CASSANDRA-10217)
+ * Fix minor bugs in MV handling (CASSANDRA-10362)
+ * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
+ * Improve MV schema representation (CASSANDRA-9921)
+ * Add flag to enable/disable coordinator batchlog for MV writes (CASSANDRA-10230)
+ * Update cqlsh COPY for new internal driver serialization interface (CASSANDRA-10318)
+ * Give index implementations more control over rebuild operations (CASSANDRA-10312)
+ * Update index file format (CASSANDRA-10314)
+ * Add "shadowable" row tombstones to deal with mv timestamp issues (CASSANDRA-10261)
+ * CFS.loadNewSSTables() broken for pre-3.0 sstables
+ * Cache selected index in read command to reduce lookups (CASSANDRA-10215)
+ * Small optimizations of sstable index serialization (CASSANDRA-10232)
+ * Support for both encrypted and unencrypted native transport connections (CASSANDRA-9590)
+Merged from 2.2:
* Configurable page size in cqlsh (CASSANDRA-9855)
* Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
- * Cancel transaction for sstables we wont redistribute index summary
- for (CASSANDRA-10270)
- * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
- * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
- * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
- * Fix repair hang when snapshot failed (CASSANDRA-10057)
- * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
- (CASSANDRA-10199)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
Merged from 2.1:
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
[02/10] cassandra git commit: Fix dropping undroppable when message
queue is full
Posted by yu...@apache.org.
Fix dropping undroppable when message queue is full
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10113
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c6411f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c6411f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c6411f0
Branch: refs/heads/cassandra-2.2
Commit: 4c6411f083b9448114a0ba349fc02e60299f6541
Parents: 39ab9e0
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 17 21:31:58 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:01 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index deec093..3364dcd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.10
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 27949c6..8b83119 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -518,6 +518,8 @@ public class OutboundTcpConnection extends Thread
while (iter.hasNext())
{
QueuedMessage qm = iter.next();
+ if (!qm.droppable)
+ continue;
if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
return;
iter.remove();
[03/10] cassandra git commit: Fix dropping undroppable when message
queue is full
Posted by yu...@apache.org.
Fix dropping undroppable when message queue is full
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10113
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c6411f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c6411f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c6411f0
Branch: refs/heads/cassandra-3.0
Commit: 4c6411f083b9448114a0ba349fc02e60299f6541
Parents: 39ab9e0
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 17 21:31:58 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:01 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index deec093..3364dcd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.10
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 27949c6..8b83119 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -518,6 +518,8 @@ public class OutboundTcpConnection extends Thread
while (iter.hasNext())
{
QueuedMessage qm = iter.next();
+ if (!qm.droppable)
+ continue;
if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
return;
iter.remove();
[06/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fc675450
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fc675450
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/fc675450
Branch: refs/heads/cassandra-2.2
Commit: fc675450e9569a1555faa43c126cd0e5d91862e0
Parents: a323641 4c6411f
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Sep 29 12:00:24 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:24 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index f3a6d44,3364dcd..c36c6f5
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,16 -1,5 +1,17 @@@
-2.1.10
+2.2.2
+ * cqlsh prompt includes name of keyspace after failed `use` statement (CASSANDRA-10369)
+ * Configurable page size in cqlsh (CASSANDRA-9855)
+ * Defer default role manager setup until all nodes are on 2.2+ (CASSANDRA-9761)
+ * Cancel transaction for sstables we wont redistribute index summary
+ for (CASSANDRA-10270)
+ * Handle missing RoleManager in config after upgrade to 2.2 (CASSANDRA-10209)
+ * Retry snapshot deletion after compaction and gc on Windows (CASSANDRA-10222)
+ * Fix failure to start with space in directory path on Windows (CASSANDRA-10239)
+ * Fix repair hang when snapshot failed (CASSANDRA-10057)
+ * Fall back to 1/4 commitlog volume for commitlog_total_space on small disks
+ (CASSANDRA-10199)
+Merged from 2.1:
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/fc675450/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[10/10] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed65ff99
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed65ff99
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed65ff99
Branch: refs/heads/trunk
Commit: ed65ff99c1b5972f9c707262aee1335f6bcd4ca7
Parents: 8765e6a 8bb7077
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Sep 29 12:02:07 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:02:07 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed65ff99/CHANGES.txt
----------------------------------------------------------------------
[04/10] cassandra git commit: Fix dropping undroppable when message
queue is full
Posted by yu...@apache.org.
Fix dropping undroppable when message queue is full
patch by yukim; reviewed by Paulo Motta for CASSANDRA-10113
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4c6411f0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4c6411f0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4c6411f0
Branch: refs/heads/trunk
Commit: 4c6411f083b9448114a0ba349fc02e60299f6541
Parents: 39ab9e0
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 17 21:31:58 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Sep 29 12:00:01 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index deec093..3364dcd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.10
+ * Fix dropping undroppable when message queue is full (CASSANDRA-10113)
* Fix potential ClassCastException during paging (CASSANDRA-10352)
* Prevent ALTER TYPE from creating circular references (CASSANDRA-10339)
* Fix cache handling of 2i and base tables (CASSANDRA-10155, 10359)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4c6411f0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 27949c6..8b83119 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -518,6 +518,8 @@ public class OutboundTcpConnection extends Thread
while (iter.hasNext())
{
QueuedMessage qm = iter.next();
+ if (!qm.droppable)
+ continue;
if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
return;
iter.remove();