You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by pa...@apache.org on 2018/01/15 12:39:31 UTC
[1/6] cassandra git commit: Close socket on error during connect on
OutboundTcpConnection
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 fde05f4f1 -> 51bf51813
refs/heads/cassandra-3.11 513352673 -> 36375f8b5
refs/heads/trunk 8587b0ceb -> 1e58a53ca
Close socket on error during connect on OutboundTcpConnection
Patch by Paulo Motta; Reviewed by Robert Stupp for CASSANDRA-9630
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51bf5181
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51bf5181
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51bf5181
Branch: refs/heads/cassandra-3.0
Commit: 51bf51813c4a7a9f9ad3adfe8ddac171b398816b
Parents: fde05f4
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Jul 28 18:49:42 2016 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Sat Jan 13 01:22:22 2018 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51bf5181/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c32e56a..0453ddd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.16
+ * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51bf5181/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 99ad194..9fbd3a8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -538,13 +538,13 @@ public class OutboundTcpConnection extends Thread
catch (SSLHandshakeException e)
{
logger.error("SSL handshake error for outbound connection to " + socket, e);
- socket = null;
+ disconnect();
// SSL errors won't be recoverable within timeout period so we'll just abort
return false;
}
catch (IOException e)
{
- socket = null;
+ disconnect();
if (logger.isTraceEnabled())
logger.trace("unable to connect to " + poolReference.endPoint(), e);
Uninterruptibles.sleepUninterruptibly(OPEN_RETRY_DELAY, TimeUnit.MILLISECONDS);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Close socket on error during connect on
OutboundTcpConnection
Posted by pa...@apache.org.
Close socket on error during connect on OutboundTcpConnection
Patch by Paulo Motta; Reviewed by Robert Stupp for CASSANDRA-9630
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51bf5181
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51bf5181
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51bf5181
Branch: refs/heads/trunk
Commit: 51bf51813c4a7a9f9ad3adfe8ddac171b398816b
Parents: fde05f4
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Jul 28 18:49:42 2016 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Sat Jan 13 01:22:22 2018 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51bf5181/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c32e56a..0453ddd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.16
+ * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51bf5181/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 99ad194..9fbd3a8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -538,13 +538,13 @@ public class OutboundTcpConnection extends Thread
catch (SSLHandshakeException e)
{
logger.error("SSL handshake error for outbound connection to " + socket, e);
- socket = null;
+ disconnect();
// SSL errors won't be recoverable within timeout period so we'll just abort
return false;
}
catch (IOException e)
{
- socket = null;
+ disconnect();
if (logger.isTraceEnabled())
logger.trace("unable to connect to " + poolReference.endPoint(), e);
Uninterruptibles.sleepUninterruptibly(OPEN_RETRY_DELAY, TimeUnit.MILLISECONDS);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36375f8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36375f8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36375f8b
Branch: refs/heads/cassandra-3.11
Commit: 36375f8b5571891e318ba4abaa61d96477e52e22
Parents: 5133526 51bf518
Author: Paulo Motta <pa...@apache.org>
Authored: Sat Jan 13 01:25:10 2018 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Sat Jan 13 01:25:10 2018 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a748e28,0453ddd..973939e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
-3.0.16
+3.11.2
+ * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
+ * Enable CDC unittest (CASSANDRA-14141)
+ * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139)
+ * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
+ * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
+ * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
+ * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109)
+ * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084)
+ * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948)
+ * Remove OpenJDK log warning (CASSANDRA-13916)
+ * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
+ * Cache disk boundaries (CASSANDRA-13215)
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
+ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
+ * Update jackson JSON jars (CASSANDRA-13949)
+ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
+Merged from 3.0:
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 6cd1064,9fbd3a8..c211f0b
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -541,8 -544,9 +541,8 @@@ public class OutboundTcpConnection exte
}
catch (IOException e)
{
- socket = null;
+ disconnect();
- if (logger.isTraceEnabled())
- logger.trace("unable to connect to " + poolReference.endPoint(), e);
+ logger.debug("Unable to connect to {}", poolReference.endPoint(), e);
Uninterruptibles.sleepUninterruptibly(OPEN_RETRY_DELAY, TimeUnit.MILLISECONDS);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Close socket on error during connect on
OutboundTcpConnection
Posted by pa...@apache.org.
Close socket on error during connect on OutboundTcpConnection
Patch by Paulo Motta; Reviewed by Robert Stupp for CASSANDRA-9630
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/51bf5181
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/51bf5181
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/51bf5181
Branch: refs/heads/cassandra-3.11
Commit: 51bf51813c4a7a9f9ad3adfe8ddac171b398816b
Parents: fde05f4
Author: Paulo Motta <pa...@gmail.com>
Authored: Thu Jul 28 18:49:42 2016 -0300
Committer: Paulo Motta <pa...@apache.org>
Committed: Sat Jan 13 01:22:22 2018 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51bf5181/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c32e56a..0453ddd 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.16
+ * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/51bf5181/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 99ad194..9fbd3a8 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@ -538,13 +538,13 @@ public class OutboundTcpConnection extends Thread
catch (SSLHandshakeException e)
{
logger.error("SSL handshake error for outbound connection to " + socket, e);
- socket = null;
+ disconnect();
// SSL errors won't be recoverable within timeout period so we'll just abort
return false;
}
catch (IOException e)
{
- socket = null;
+ disconnect();
if (logger.isTraceEnabled())
logger.trace("unable to connect to " + poolReference.endPoint(), e);
Uninterruptibles.sleepUninterruptibly(OPEN_RETRY_DELAY, TimeUnit.MILLISECONDS);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by pa...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36375f8b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36375f8b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36375f8b
Branch: refs/heads/trunk
Commit: 36375f8b5571891e318ba4abaa61d96477e52e22
Parents: 5133526 51bf518
Author: Paulo Motta <pa...@apache.org>
Authored: Sat Jan 13 01:25:10 2018 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Sat Jan 13 01:25:10 2018 -0200
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/net/OutboundTcpConnection.java | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index a748e28,0453ddd..973939e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,20 -1,5 +1,21 @@@
-3.0.16
+3.11.2
+ * Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
+ * Enable CDC unittest (CASSANDRA-14141)
+ * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139)
+ * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
+ * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
+ * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
+ * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109)
+ * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084)
+ * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948)
+ * Remove OpenJDK log warning (CASSANDRA-13916)
+ * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
+ * Cache disk boundaries (CASSANDRA-13215)
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
+ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
+ * Update jackson JSON jars (CASSANDRA-13949)
+ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
+Merged from 3.0:
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36375f8b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/net/OutboundTcpConnection.java
index 6cd1064,9fbd3a8..c211f0b
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java
@@@ -541,8 -544,9 +541,8 @@@ public class OutboundTcpConnection exte
}
catch (IOException e)
{
- socket = null;
+ disconnect();
- if (logger.isTraceEnabled())
- logger.trace("unable to connect to " + poolReference.endPoint(), e);
+ logger.debug("Unable to connect to {}", poolReference.endPoint(), e);
Uninterruptibles.sleepUninterruptibly(OPEN_RETRY_DELAY, TimeUnit.MILLISECONDS);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by pa...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e58a53c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e58a53c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e58a53c
Branch: refs/heads/trunk
Commit: 1e58a53ca17d1292acbb820a2f7c334210e9a33e
Parents: 8587b0c 36375f8
Author: Paulo Motta <pa...@apache.org>
Authored: Sat Jan 13 01:27:15 2018 -0200
Committer: Paulo Motta <pa...@apache.org>
Committed: Sat Jan 13 01:27:15 2018 -0200
----------------------------------------------------------------------
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org