You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/03/08 17:22:50 UTC
[01/15] cassandra git commit: Add missing unit conversion when
timeouting outbound messages
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 e01b3a94a -> e94a2a034
refs/heads/cassandra-2.2 2971ff3b4 -> 9b53d6a5b
refs/heads/cassandra-3.0 504760c46 -> c2b47baf3
refs/heads/cassandra-3.5 719f584ea -> 17d1b1b04
refs/heads/trunk 97fe1aab4 -> be20457c0
Add missing unit conversion when timeouting outbound messages
patch by slebresne; reviewed by aweisberg for CASSANDRA-11302
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e94a2a03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e94a2a03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e94a2a03
Branch: refs/heads/cassandra-2.1
Commit: e94a2a0341fc01a864968283073a0839823f3643
Parents: e01b3a9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 10:56:42 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:20:43 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d6b085c..e7c997a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/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 dfebe9a..0d588c8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -212,7 +212,7 @@ public class OutboundTcpConnection extends Thread
continue;
}
- if (qm.isTimedOut(TimeUnit.MILLISECONDS.toNanos(m.getTimeout()), System.nanoTime()))
+ if (qm.isTimedOut())
dropped.incrementAndGet();
else if (socket != null || connect())
writeConnected(qm, count == 1 && backlog.isEmpty());
@@ -522,7 +522,7 @@ public class OutboundTcpConnection extends Thread
QueuedMessage qm = iter.next();
if (!qm.droppable)
continue;
- if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
+ if (!qm.isTimedOut())
return;
iter.remove();
dropped.incrementAndGet();
@@ -546,9 +546,9 @@ public class OutboundTcpConnection extends Thread
}
/** don't drop a non-droppable message just because it's timestamp is expired */
- boolean isTimedOut(long maxTimeNanos, long nowNanos)
+ boolean isTimedOut()
{
- return droppable && timestampNanos < nowNanos - maxTimeNanos;
+ return droppable && timestampNanos < System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(message.getTimeout());
}
boolean shouldRetry()
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@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/9b53d6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b53d6a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b53d6a5
Branch: refs/heads/cassandra-2.2
Commit: 9b53d6a5b7f8d92203765effaa2e20e88d3b08ae
Parents: 2971ff3 e94a2a0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:21:25 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:21:25 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b67cdc,e7c997a..9d4779a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
-2.1.14
+2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
+ * Fix filtering on non-primary key columns for thrift static column families
+ (CASSANDRA-6377)
+ * Only log yaml config once, at startup (CASSANDRA-11217)
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
+ * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
+ * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes
+ (CASSANDRA-10010)
+Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@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/9b53d6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b53d6a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b53d6a5
Branch: refs/heads/cassandra-3.5
Commit: 9b53d6a5b7f8d92203765effaa2e20e88d3b08ae
Parents: 2971ff3 e94a2a0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:21:25 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:21:25 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b67cdc,e7c997a..9d4779a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
-2.1.14
+2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
+ * Fix filtering on non-primary key columns for thrift static column families
+ (CASSANDRA-6377)
+ * Only log yaml config once, at startup (CASSANDRA-11217)
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
+ * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
+ * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes
+ (CASSANDRA-10010)
+Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[02/15] cassandra git commit: Add missing unit conversion when
timeouting outbound messages
Posted by sl...@apache.org.
Add missing unit conversion when timeouting outbound messages
patch by slebresne; reviewed by aweisberg for CASSANDRA-11302
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e94a2a03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e94a2a03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e94a2a03
Branch: refs/heads/cassandra-2.2
Commit: e94a2a0341fc01a864968283073a0839823f3643
Parents: e01b3a9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 10:56:42 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:20:43 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d6b085c..e7c997a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/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 dfebe9a..0d588c8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -212,7 +212,7 @@ public class OutboundTcpConnection extends Thread
continue;
}
- if (qm.isTimedOut(TimeUnit.MILLISECONDS.toNanos(m.getTimeout()), System.nanoTime()))
+ if (qm.isTimedOut())
dropped.incrementAndGet();
else if (socket != null || connect())
writeConnected(qm, count == 1 && backlog.isEmpty());
@@ -522,7 +522,7 @@ public class OutboundTcpConnection extends Thread
QueuedMessage qm = iter.next();
if (!qm.droppable)
continue;
- if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
+ if (!qm.isTimedOut())
return;
iter.remove();
dropped.incrementAndGet();
@@ -546,9 +546,9 @@ public class OutboundTcpConnection extends Thread
}
/** don't drop a non-droppable message just because it's timestamp is expired */
- boolean isTimedOut(long maxTimeNanos, long nowNanos)
+ boolean isTimedOut()
{
- return droppable && timestampNanos < nowNanos - maxTimeNanos;
+ return droppable && timestampNanos < System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(message.getTimeout());
}
boolean shouldRetry()
[05/15] cassandra git commit: Add missing unit conversion when
timeouting outbound messages
Posted by sl...@apache.org.
Add missing unit conversion when timeouting outbound messages
patch by slebresne; reviewed by aweisberg for CASSANDRA-11302
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e94a2a03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e94a2a03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e94a2a03
Branch: refs/heads/cassandra-3.5
Commit: e94a2a0341fc01a864968283073a0839823f3643
Parents: e01b3a9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 10:56:42 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:20:43 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d6b085c..e7c997a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/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 dfebe9a..0d588c8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -212,7 +212,7 @@ public class OutboundTcpConnection extends Thread
continue;
}
- if (qm.isTimedOut(TimeUnit.MILLISECONDS.toNanos(m.getTimeout()), System.nanoTime()))
+ if (qm.isTimedOut())
dropped.incrementAndGet();
else if (socket != null || connect())
writeConnected(qm, count == 1 && backlog.isEmpty());
@@ -522,7 +522,7 @@ public class OutboundTcpConnection extends Thread
QueuedMessage qm = iter.next();
if (!qm.droppable)
continue;
- if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
+ if (!qm.isTimedOut())
return;
iter.remove();
dropped.incrementAndGet();
@@ -546,9 +546,9 @@ public class OutboundTcpConnection extends Thread
}
/** don't drop a non-droppable message just because it's timestamp is expired */
- boolean isTimedOut(long maxTimeNanos, long nowNanos)
+ boolean isTimedOut()
{
- return droppable && timestampNanos < nowNanos - maxTimeNanos;
+ return droppable && timestampNanos < System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(message.getTimeout());
}
boolean shouldRetry()
[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17d1b1b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17d1b1b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17d1b1b0
Branch: refs/heads/cassandra-3.5
Commit: 17d1b1b0438c07778b34f6100c9c1fec1b4b210a
Parents: 719f584 c2b47ba
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:22:14 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:22:14 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d1b1b0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c88ae54,384e7ea..72ce859
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -84,9 -52,11 +84,12 @@@ Merged from 2.2
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
* Fix paging on DISTINCT queries repeats result when first row in partition changes
(CASSANDRA-10010)
+ * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
* cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
+ * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
+ * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
* Only notify if repair status changed (CASSANDRA-11172)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d1b1b0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@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/9b53d6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b53d6a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b53d6a5
Branch: refs/heads/cassandra-3.0
Commit: 9b53d6a5b7f8d92203765effaa2e20e88d3b08ae
Parents: 2971ff3 e94a2a0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:21:25 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:21:25 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b67cdc,e7c997a..9d4779a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
-2.1.14
+2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
+ * Fix filtering on non-primary key columns for thrift static column families
+ (CASSANDRA-6377)
+ * Only log yaml config once, at startup (CASSANDRA-11217)
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
+ * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
+ * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes
+ (CASSANDRA-10010)
+Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@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/c2b47baf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2b47baf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2b47baf
Branch: refs/heads/cassandra-3.5
Commit: c2b47baf3fdae0750c3b66289b9e9b57d36e2381
Parents: 504760c 9b53d6a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:21:59 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:21:59 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5b92143,9d4779a..384e7ea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,10 -24,13 +52,13 @@@ Merged from 2.2
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
* Fix paging on DISTINCT queries repeats result when first row in partition changes
(CASSANDRA-10010)
+ * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
+ * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
+ * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
* Only notify if repair status changed (CASSANDRA-11172)
- * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
* Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
* Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[04/15] cassandra git commit: Add missing unit conversion when
timeouting outbound messages
Posted by sl...@apache.org.
Add missing unit conversion when timeouting outbound messages
patch by slebresne; reviewed by aweisberg for CASSANDRA-11302
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e94a2a03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e94a2a03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e94a2a03
Branch: refs/heads/cassandra-3.0
Commit: e94a2a0341fc01a864968283073a0839823f3643
Parents: e01b3a9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 10:56:42 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:20:43 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d6b085c..e7c997a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/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 dfebe9a..0d588c8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -212,7 +212,7 @@ public class OutboundTcpConnection extends Thread
continue;
}
- if (qm.isTimedOut(TimeUnit.MILLISECONDS.toNanos(m.getTimeout()), System.nanoTime()))
+ if (qm.isTimedOut())
dropped.incrementAndGet();
else if (socket != null || connect())
writeConnected(qm, count == 1 && backlog.isEmpty());
@@ -522,7 +522,7 @@ public class OutboundTcpConnection extends Thread
QueuedMessage qm = iter.next();
if (!qm.droppable)
continue;
- if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
+ if (!qm.isTimedOut())
return;
iter.remove();
dropped.incrementAndGet();
@@ -546,9 +546,9 @@ public class OutboundTcpConnection extends Thread
}
/** don't drop a non-droppable message just because it's timestamp is expired */
- boolean isTimedOut(long maxTimeNanos, long nowNanos)
+ boolean isTimedOut()
{
- return droppable && timestampNanos < nowNanos - maxTimeNanos;
+ return droppable && timestampNanos < System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(message.getTimeout());
}
boolean shouldRetry()
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sl...@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/9b53d6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b53d6a5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b53d6a5
Branch: refs/heads/trunk
Commit: 9b53d6a5b7f8d92203765effaa2e20e88d3b08ae
Parents: 2971ff3 e94a2a0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:21:25 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:21:25 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7b67cdc,e7c997a..9d4779a
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,30 -1,5 +1,31 @@@
-2.1.14
+2.2.6
+ * Fix AE in nodetool cfstats (backport CASSANDRA-10859) (CASSANDRA-11297)
+ * Unresolved hostname leads to replace being ignored (CASSANDRA-11210)
+ * Fix filtering on non-primary key columns for thrift static column families
+ (CASSANDRA-6377)
+ * Only log yaml config once, at startup (CASSANDRA-11217)
+ * Preserve order for preferred SSL cipher suites (CASSANDRA-11164)
+ * Reference leak with parallel repairs on the same table (CASSANDRA-11215)
+ * Range.compareTo() violates the contract of Comparable (CASSANDRA-11216)
+ * Avoid NPE when serializing ErrorMessage with null message (CASSANDRA-11167)
+ * Replacing an aggregate with a new version doesn't reset INITCOND (CASSANDRA-10840)
+ * (cqlsh) cqlsh cannot be called through symlink (CASSANDRA-11037)
+ * fix ohc and java-driver pom dependencies in build.xml (CASSANDRA-10793)
+ * Protect from keyspace dropped during repair (CASSANDRA-11065)
+ * Handle adding fields to a UDT in SELECT JSON and toJson() (CASSANDRA-11146)
+ * Better error message for cleanup (CASSANDRA-10991)
+ * cqlsh pg-style-strings broken if line ends with ';' (CASSANDRA-11123)
+ * Use cloned TokenMetadata in size estimates to avoid race against membership check
+ (CASSANDRA-10736)
+ * Always persist upsampled index summaries (CASSANDRA-10512)
+ * (cqlsh) Fix inconsistent auto-complete (CASSANDRA-10733)
+ * Make SELECT JSON and toJson() threadsafe (CASSANDRA-11048)
+ * Fix SELECT on tuple relations for mixed ASC/DESC clustering order (CASSANDRA-7281)
+ * (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
+ * Fix paging on DISTINCT queries repeats result when first row in partition changes
+ (CASSANDRA-10010)
+Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b53d6a5/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/be20457c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/be20457c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/be20457c
Branch: refs/heads/trunk
Commit: be20457c0d2583ea9e81a3000e9709aa6151d09c
Parents: 97fe1aa 17d1b1b
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:22:23 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:22:23 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/be20457c/CHANGES.txt
----------------------------------------------------------------------
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@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/c2b47baf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2b47baf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2b47baf
Branch: refs/heads/trunk
Commit: c2b47baf3fdae0750c3b66289b9e9b57d36e2381
Parents: 504760c 9b53d6a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:21:59 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:21:59 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5b92143,9d4779a..384e7ea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,10 -24,13 +52,13 @@@ Merged from 2.2
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
* Fix paging on DISTINCT queries repeats result when first row in partition changes
(CASSANDRA-10010)
+ * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
+ * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
+ * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
* Only notify if repair status changed (CASSANDRA-11172)
- * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
* Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
* Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[03/15] cassandra git commit: Add missing unit conversion when
timeouting outbound messages
Posted by sl...@apache.org.
Add missing unit conversion when timeouting outbound messages
patch by slebresne; reviewed by aweisberg for CASSANDRA-11302
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e94a2a03
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e94a2a03
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e94a2a03
Branch: refs/heads/trunk
Commit: e94a2a0341fc01a864968283073a0839823f3643
Parents: e01b3a9
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 10:56:42 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:20:43 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index d6b085c..e7c997a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.14
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
* COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
* InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e94a2a03/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 dfebe9a..0d588c8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -212,7 +212,7 @@ public class OutboundTcpConnection extends Thread
continue;
}
- if (qm.isTimedOut(TimeUnit.MILLISECONDS.toNanos(m.getTimeout()), System.nanoTime()))
+ if (qm.isTimedOut())
dropped.incrementAndGet();
else if (socket != null || connect())
writeConnected(qm, count == 1 && backlog.isEmpty());
@@ -522,7 +522,7 @@ public class OutboundTcpConnection extends Thread
QueuedMessage qm = iter.next();
if (!qm.droppable)
continue;
- if (qm.timestampNanos >= System.nanoTime() - qm.message.getTimeout())
+ if (!qm.isTimedOut())
return;
iter.remove();
dropped.incrementAndGet();
@@ -546,9 +546,9 @@ public class OutboundTcpConnection extends Thread
}
/** don't drop a non-droppable message just because it's timestamp is expired */
- boolean isTimedOut(long maxTimeNanos, long nowNanos)
+ boolean isTimedOut()
{
- return droppable && timestampNanos < nowNanos - maxTimeNanos;
+ return droppable && timestampNanos < System.nanoTime() - TimeUnit.MILLISECONDS.toNanos(message.getTimeout());
}
boolean shouldRetry()
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sl...@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/c2b47baf
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2b47baf
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2b47baf
Branch: refs/heads/cassandra-3.0
Commit: c2b47baf3fdae0750c3b66289b9e9b57d36e2381
Parents: 504760c 9b53d6a
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:21:59 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:21:59 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 5b92143,9d4779a..384e7ea
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,10 -24,13 +52,13 @@@ Merged from 2.2
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
* Fix paging on DISTINCT queries repeats result when first row in partition changes
(CASSANDRA-10010)
+ * cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
+ * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
+ * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
* Only notify if repair status changed (CASSANDRA-11172)
- * Add partition key to TombstoneOverwhelmingException error message (CASSANDRA-10888)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
* Fix sstableloader to unthrottle streaming by default (CASSANDRA-9714)
* Fix incorrect warning in 'nodetool status' (CASSANDRA-10176)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2b47baf/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.5
Posted by sl...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/17d1b1b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/17d1b1b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/17d1b1b0
Branch: refs/heads/trunk
Commit: 17d1b1b0438c07778b34f6100c9c1fec1b4b210a
Parents: 719f584 c2b47ba
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Mar 8 17:22:14 2016 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Mar 8 17:22:14 2016 +0100
----------------------------------------------------------------------
CHANGES.txt | 3 +++
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 8 ++++----
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d1b1b0/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index c88ae54,384e7ea..72ce859
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -84,9 -52,11 +84,12 @@@ Merged from 2.2
* (cqlsh) Support utf-8/cp65001 encoding on Windows (CASSANDRA-11030)
* Fix paging on DISTINCT queries repeats result when first row in partition changes
(CASSANDRA-10010)
+ * (cqlsh) Support timezone conversion using pytz (CASSANDRA-10397)
* cqlsh: change default encoding to UTF-8 (CASSANDRA-11124)
Merged from 2.1:
+ * Avoid dropping message too quickly due to missing unit conversion (CASSANDRA-11302)
+ * COPY FROM on large datasets: fix progress report and debug performance (CASSANDRA-11053)
+ * InvalidateKeys should have a weak ref to key cache (CASSANDRA-11176)
* Don't remove FailureDetector history on removeEndpoint (CASSANDRA-10371)
* Only notify if repair status changed (CASSANDRA-11172)
* Use logback setting for 'cassandra -v' command (CASSANDRA-10767)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/17d1b1b0/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------