You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/01/08 17:12:24 UTC
[01/15] cassandra git commit: Maybe retry sending digest syn during
shadow round
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 812df9e8b -> 0f27d68fc
refs/heads/cassandra-2.2 23123f04f -> e8bd8a44b
refs/heads/cassandra-3.0 9c1679d1b -> eca74ad24
refs/heads/cassandra-3.3 3ad609062 -> b2af80b4a
refs/heads/trunk 267ab31db -> 273ea780d
Maybe retry sending digest syn during shadow round
Patch by Stefania Alborghetti; reviewed by Sam Tunnicliffe for
CASSANDRA-8072
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f27d68f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f27d68f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f27d68f
Branch: refs/heads/cassandra-2.1
Commit: 0f27d68fc23a942c0fa27ba4662621891939eaed
Parents: 812df9e
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Sat Dec 19 14:23:52 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 15:54:17 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c167098..a6a0c60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 130b531..59ef3cc 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -122,7 +122,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private final Map<InetAddress, Long> expireTimeEndpointMap = new ConcurrentHashMap<InetAddress, Long>();
- private boolean inShadowRound = false;
+ private volatile boolean inShadowRound = false;
private volatile long lastProcessedMessageAt = System.currentTimeMillis();
@@ -1321,17 +1321,24 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
MessageOut<GossipDigestSyn> message = new MessageOut<GossipDigestSyn>(MessagingService.Verb.GOSSIP_DIGEST_SYN,
digestSynMessage,
GossipDigestSyn.serializer);
+
inShadowRound = true;
- for (InetAddress seed : seeds)
- MessagingService.instance().sendOneWay(message, seed);
int slept = 0;
try
{
while (true)
{
+ if (slept % 5000 == 0)
+ { // CASSANDRA-8072, retry at the beginning and every 5 seconds
+ logger.trace("Sending shadow round GOSSIP DIGEST SYN to seeds {}", seeds);
+ for (InetAddress seed : seeds)
+ MessagingService.instance().sendOneWay(message, seed);
+ }
+
Thread.sleep(1000);
if (!inShadowRound)
break;
+
slept += 1000;
if (slept > StorageService.RING_DELAY)
throw new RuntimeException("Unable to gossip with any seeds");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 09ce717..198976b 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -111,6 +111,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
{
try
{
+ if (logger.isTraceEnabled())
+ logger.trace("Closing socket {} - isclosed: {}", socket, socket.isClosed());
if (!socket.isClosed())
{
socket.close();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/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 8b83119..dfebe9a 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -352,6 +352,8 @@ public class OutboundTcpConnection extends Thread
try
{
socket.close();
+ if (logger.isTraceEnabled())
+ logger.trace("Socket to {} closed", poolReference.endPoint());
}
catch (IOException e)
{
[05/15] cassandra git commit: Maybe retry sending digest syn during
shadow round
Posted by sa...@apache.org.
Maybe retry sending digest syn during shadow round
Patch by Stefania Alborghetti; reviewed by Sam Tunnicliffe for
CASSANDRA-8072
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f27d68f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f27d68f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f27d68f
Branch: refs/heads/cassandra-3.3
Commit: 0f27d68fc23a942c0fa27ba4662621891939eaed
Parents: 812df9e
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Sat Dec 19 14:23:52 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 15:54:17 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c167098..a6a0c60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 130b531..59ef3cc 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -122,7 +122,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private final Map<InetAddress, Long> expireTimeEndpointMap = new ConcurrentHashMap<InetAddress, Long>();
- private boolean inShadowRound = false;
+ private volatile boolean inShadowRound = false;
private volatile long lastProcessedMessageAt = System.currentTimeMillis();
@@ -1321,17 +1321,24 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
MessageOut<GossipDigestSyn> message = new MessageOut<GossipDigestSyn>(MessagingService.Verb.GOSSIP_DIGEST_SYN,
digestSynMessage,
GossipDigestSyn.serializer);
+
inShadowRound = true;
- for (InetAddress seed : seeds)
- MessagingService.instance().sendOneWay(message, seed);
int slept = 0;
try
{
while (true)
{
+ if (slept % 5000 == 0)
+ { // CASSANDRA-8072, retry at the beginning and every 5 seconds
+ logger.trace("Sending shadow round GOSSIP DIGEST SYN to seeds {}", seeds);
+ for (InetAddress seed : seeds)
+ MessagingService.instance().sendOneWay(message, seed);
+ }
+
Thread.sleep(1000);
if (!inShadowRound)
break;
+
slept += 1000;
if (slept > StorageService.RING_DELAY)
throw new RuntimeException("Unable to gossip with any seeds");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 09ce717..198976b 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -111,6 +111,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
{
try
{
+ if (logger.isTraceEnabled())
+ logger.trace("Closing socket {} - isclosed: {}", socket, socket.isClosed());
if (!socket.isClosed())
{
socket.close();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/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 8b83119..dfebe9a 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -352,6 +352,8 @@ public class OutboundTcpConnection extends Thread
try
{
socket.close();
+ if (logger.isTraceEnabled())
+ logger.trace("Socket to {} closed", poolReference.endPoint());
}
catch (IOException e)
{
[07/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@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/e8bd8a44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8bd8a44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8bd8a44
Branch: refs/heads/cassandra-2.2
Commit: e8bd8a44bcedbefd6874d0eb35e4a03c0027e9f1
Parents: 23123f0 0f27d68
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:05:14 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:05:14 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e5c4430,a6a0c60..50d5f60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-2.1.13
+2.2.5
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[02/15] cassandra git commit: Maybe retry sending digest syn during
shadow round
Posted by sa...@apache.org.
Maybe retry sending digest syn during shadow round
Patch by Stefania Alborghetti; reviewed by Sam Tunnicliffe for
CASSANDRA-8072
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f27d68f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f27d68f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f27d68f
Branch: refs/heads/cassandra-2.2
Commit: 0f27d68fc23a942c0fa27ba4662621891939eaed
Parents: 812df9e
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Sat Dec 19 14:23:52 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 15:54:17 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c167098..a6a0c60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 130b531..59ef3cc 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -122,7 +122,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private final Map<InetAddress, Long> expireTimeEndpointMap = new ConcurrentHashMap<InetAddress, Long>();
- private boolean inShadowRound = false;
+ private volatile boolean inShadowRound = false;
private volatile long lastProcessedMessageAt = System.currentTimeMillis();
@@ -1321,17 +1321,24 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
MessageOut<GossipDigestSyn> message = new MessageOut<GossipDigestSyn>(MessagingService.Verb.GOSSIP_DIGEST_SYN,
digestSynMessage,
GossipDigestSyn.serializer);
+
inShadowRound = true;
- for (InetAddress seed : seeds)
- MessagingService.instance().sendOneWay(message, seed);
int slept = 0;
try
{
while (true)
{
+ if (slept % 5000 == 0)
+ { // CASSANDRA-8072, retry at the beginning and every 5 seconds
+ logger.trace("Sending shadow round GOSSIP DIGEST SYN to seeds {}", seeds);
+ for (InetAddress seed : seeds)
+ MessagingService.instance().sendOneWay(message, seed);
+ }
+
Thread.sleep(1000);
if (!inShadowRound)
break;
+
slept += 1000;
if (slept > StorageService.RING_DELAY)
throw new RuntimeException("Unable to gossip with any seeds");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 09ce717..198976b 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -111,6 +111,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
{
try
{
+ if (logger.isTraceEnabled())
+ logger.trace("Closing socket {} - isclosed: {}", socket, socket.isClosed());
if (!socket.isClosed())
{
socket.close();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/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 8b83119..dfebe9a 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -352,6 +352,8 @@ public class OutboundTcpConnection extends Thread
try
{
socket.close();
+ if (logger.isTraceEnabled())
+ logger.trace("Socket to {} closed", poolReference.endPoint());
}
catch (IOException e)
{
[04/15] cassandra git commit: Maybe retry sending digest syn during
shadow round
Posted by sa...@apache.org.
Maybe retry sending digest syn during shadow round
Patch by Stefania Alborghetti; reviewed by Sam Tunnicliffe for
CASSANDRA-8072
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f27d68f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f27d68f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f27d68f
Branch: refs/heads/cassandra-3.0
Commit: 0f27d68fc23a942c0fa27ba4662621891939eaed
Parents: 812df9e
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Sat Dec 19 14:23:52 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 15:54:17 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c167098..a6a0c60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 130b531..59ef3cc 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -122,7 +122,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private final Map<InetAddress, Long> expireTimeEndpointMap = new ConcurrentHashMap<InetAddress, Long>();
- private boolean inShadowRound = false;
+ private volatile boolean inShadowRound = false;
private volatile long lastProcessedMessageAt = System.currentTimeMillis();
@@ -1321,17 +1321,24 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
MessageOut<GossipDigestSyn> message = new MessageOut<GossipDigestSyn>(MessagingService.Verb.GOSSIP_DIGEST_SYN,
digestSynMessage,
GossipDigestSyn.serializer);
+
inShadowRound = true;
- for (InetAddress seed : seeds)
- MessagingService.instance().sendOneWay(message, seed);
int slept = 0;
try
{
while (true)
{
+ if (slept % 5000 == 0)
+ { // CASSANDRA-8072, retry at the beginning and every 5 seconds
+ logger.trace("Sending shadow round GOSSIP DIGEST SYN to seeds {}", seeds);
+ for (InetAddress seed : seeds)
+ MessagingService.instance().sendOneWay(message, seed);
+ }
+
Thread.sleep(1000);
if (!inShadowRound)
break;
+
slept += 1000;
if (slept > StorageService.RING_DELAY)
throw new RuntimeException("Unable to gossip with any seeds");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 09ce717..198976b 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -111,6 +111,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
{
try
{
+ if (logger.isTraceEnabled())
+ logger.trace("Closing socket {} - isclosed: {}", socket, socket.isClosed());
if (!socket.isClosed())
{
socket.close();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/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 8b83119..dfebe9a 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -352,6 +352,8 @@ public class OutboundTcpConnection extends Thread
try
{
socket.close();
+ if (logger.isTraceEnabled())
+ logger.trace("Socket to {} closed", poolReference.endPoint());
}
catch (IOException e)
{
[03/15] cassandra git commit: Maybe retry sending digest syn during
shadow round
Posted by sa...@apache.org.
Maybe retry sending digest syn during shadow round
Patch by Stefania Alborghetti; reviewed by Sam Tunnicliffe for
CASSANDRA-8072
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f27d68f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f27d68f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f27d68f
Branch: refs/heads/trunk
Commit: 0f27d68fc23a942c0fa27ba4662621891939eaed
Parents: 812df9e
Author: Stefania Alborghetti <st...@datastax.com>
Authored: Sat Dec 19 14:23:52 2015 +0100
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 15:54:17 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c167098..a6a0c60 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index 130b531..59ef3cc 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -122,7 +122,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private final Map<InetAddress, Long> expireTimeEndpointMap = new ConcurrentHashMap<InetAddress, Long>();
- private boolean inShadowRound = false;
+ private volatile boolean inShadowRound = false;
private volatile long lastProcessedMessageAt = System.currentTimeMillis();
@@ -1321,17 +1321,24 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
MessageOut<GossipDigestSyn> message = new MessageOut<GossipDigestSyn>(MessagingService.Verb.GOSSIP_DIGEST_SYN,
digestSynMessage,
GossipDigestSyn.serializer);
+
inShadowRound = true;
- for (InetAddress seed : seeds)
- MessagingService.instance().sendOneWay(message, seed);
int slept = 0;
try
{
while (true)
{
+ if (slept % 5000 == 0)
+ { // CASSANDRA-8072, retry at the beginning and every 5 seconds
+ logger.trace("Sending shadow round GOSSIP DIGEST SYN to seeds {}", seeds);
+ for (InetAddress seed : seeds)
+ MessagingService.instance().sendOneWay(message, seed);
+ }
+
Thread.sleep(1000);
if (!inShadowRound)
break;
+
slept += 1000;
if (slept > StorageService.RING_DELAY)
throw new RuntimeException("Unable to gossip with any seeds");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 09ce717..198976b 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -111,6 +111,8 @@ public class IncomingTcpConnection extends Thread implements Closeable
{
try
{
+ if (logger.isTraceEnabled())
+ logger.trace("Closing socket {} - isclosed: {}", socket, socket.isClosed());
if (!socket.isClosed())
{
socket.close();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f27d68f/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 8b83119..dfebe9a 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -352,6 +352,8 @@ public class OutboundTcpConnection extends Thread
try
{
socket.close();
+ if (logger.isTraceEnabled())
+ logger.trace("Socket to {} closed", poolReference.endPoint());
}
catch (IOException e)
{
[10/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@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/eca74ad2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eca74ad2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eca74ad2
Branch: refs/heads/trunk
Commit: eca74ad240b13ad2d051a9a1ca42162afdaf3bea
Parents: 9c1679d e8bd8a4
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:07:26 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:07:26 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
[12/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@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/eca74ad2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eca74ad2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eca74ad2
Branch: refs/heads/cassandra-3.0
Commit: eca74ad240b13ad2d051a9a1ca42162afdaf3bea
Parents: 9c1679d e8bd8a4
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:07:26 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:07:26 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
[13/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2af80b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2af80b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2af80b4
Branch: refs/heads/cassandra-3.3
Commit: b2af80b4acdc9db4cdd9c26cc81f4336e2ebfccc
Parents: 3ad6090 eca74ad
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:08:53 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:08:53 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2af80b4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 92493d7,25c93e9..edb5bc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,7 -21,12 +52,8 @@@ Merged from 2.2
* (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
* Add new types to Stress (CASSANDRA-9556)
* Add property to allow listening on broadcast interface (CASSANDRA-9748)
- * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
- * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2af80b4/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
[09/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@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/e8bd8a44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8bd8a44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8bd8a44
Branch: refs/heads/cassandra-3.3
Commit: e8bd8a44bcedbefd6874d0eb35e4a03c0027e9f1
Parents: 23123f0 0f27d68
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:05:14 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:05:14 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e5c4430,a6a0c60..50d5f60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-2.1.13
+2.2.5
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[15/15] cassandra git commit: Merge branch 'cassandra-3.3' into trunk
Posted by sa...@apache.org.
Merge branch 'cassandra-3.3' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/273ea780
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/273ea780
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/273ea780
Branch: refs/heads/trunk
Commit: 273ea780d803547d0575f90dbb5b97314caf3b2a
Parents: 267ab31 b2af80b
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:10:16 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:10:16 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/273ea780/CHANGES.txt
----------------------------------------------------------------------
[08/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@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/e8bd8a44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8bd8a44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8bd8a44
Branch: refs/heads/cassandra-3.0
Commit: e8bd8a44bcedbefd6874d0eb35e4a03c0027e9f1
Parents: 23123f0 0f27d68
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:05:14 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:05:14 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e5c4430,a6a0c60..50d5f60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-2.1.13
+2.2.5
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[06/15] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by sa...@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/e8bd8a44
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8bd8a44
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8bd8a44
Branch: refs/heads/trunk
Commit: e8bd8a44bcedbefd6874d0eb35e4a03c0027e9f1
Parents: 23123f0 0f27d68
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:05:14 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:05:14 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index e5c4430,a6a0c60..50d5f60
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
-2.1.13
+2.2.5
+ * Histogram buckets exposed in jmx are sorted incorrectly (CASSANDRA-10975)
+ * Enable GC logging by default (CASSANDRA-10140)
+ * Optimize pending range computation (CASSANDRA-9258)
+ * Skip commit log and saved cache directories in SSTable version startup check (CASSANDRA-10902)
+ * drop/alter user should be case sensitive (CASSANDRA-10817)
+ * jemalloc detection fails due to quoting issues in regexv (CASSANDRA-10946)
+ * Support counter-columns for native aggregates (sum,avg,max,min) (CASSANDRA-9977)
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8bd8a44/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
[14/15] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.3
Posted by sa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.3
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b2af80b4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b2af80b4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b2af80b4
Branch: refs/heads/trunk
Commit: b2af80b4acdc9db4cdd9c26cc81f4336e2ebfccc
Parents: 3ad6090 eca74ad
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:08:53 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:08:53 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2af80b4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 92493d7,25c93e9..edb5bc0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -52,7 -21,12 +52,8 @@@ Merged from 2.2
* (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
* Add new types to Stress (CASSANDRA-9556)
* Add property to allow listening on broadcast interface (CASSANDRA-9748)
- * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
- * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
+ * Retry sending gossip syn multiple times during shadow round (CASSANDRA-8072)
* Fix pending range calculation during moves (CASSANDRA-10887)
* Sane default (200Mbps) for inter-DC streaming througput (CASSANDRA-9708)
* Match cassandra-loader options in COPY FROM (CASSANDRA-9303)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b2af80b4/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
[11/15] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by sa...@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/eca74ad2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eca74ad2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eca74ad2
Branch: refs/heads/cassandra-3.3
Commit: eca74ad240b13ad2d051a9a1ca42162afdaf3bea
Parents: 9c1679d e8bd8a4
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Fri Jan 8 16:07:26 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Fri Jan 8 16:07:26 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/gms/Gossiper.java | 13 ++++++++++---
.../apache/cassandra/net/IncomingTcpConnection.java | 2 ++
.../apache/cassandra/net/OutboundTcpConnection.java | 2 ++
4 files changed, 15 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eca74ad2/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------